Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 721413af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty/serial driver updates from Greg KH:
 "Here is the big tty and serial driver update for 4.8-rc1.

  Lots of good cleanups from Jiri on a number of vt and other tty
  related things, and the normal driver updates.  Full details are in
  the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (90 commits)
  tty/serial: atmel: enforce tasklet init and termination sequences
  serial: sh-sci: Stop transfers in sci_shutdown()
  serial: 8250_ingenic: drop #if conditional surrounding earlycon code
  serial: 8250_mtk: drop !defined(MODULE) conditional
  serial: 8250_uniphier: drop !defined(MODULE) conditional
  earlycon: mark earlycon code as __used iif the caller is built-in
  tty/serial/8250: use mctrl_gpio helpers
  serial: mctrl_gpio: enable API usage only for initialized mctrl_gpios struct
  serial: mctrl_gpio: add modem control read routine
  tty/serial/8250: make UART_MCR register access consistent
  serial: 8250_mid: Read RX buffer on RX DMA timeout for DNV
  serial: 8250_dma: Export serial8250_rx_dma_flush()
  dmaengine: hsu: Export hsu_dma_get_status()
  tty: serial: 8250: add CON_CONSDEV to flags
  tty: serial: samsung: add byte-order aware bit functions
  tty: serial: samsung: fixup accessors for endian
  serial: sirf: make fifo functions static
  serial: mps2-uart: make driver explicitly non-modular
  serial: mvebu-uart: free the IRQ in ->shutdown()
  serial/bcm63xx_uart: use correct alias naming
  ...
parents 25a0dc4b 67417f9c

Documentation/devicetree/bindings/serial/8250.txt

+19 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ Optional properties: 
- auto-flow-control: one way to enable automatic flow control support. The

  driver is allowed to detect support for the capability even without this

  property.

- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD

  line respectively. It will use specified GPIO instead of the peripheral

  function pin for the UART feature. If unsure, don't specify this property.



Note:

* fsl,ns16550:
@@ -63,3 +66,19 @@ Example: 
		interrupts = <10>;

		reg-shift = <2>;

	};



Example for OMAP UART using GPIO-based modem control signals:



	uart4: serial@49042000 {

		compatible = "ti,omap3-uart";

		reg = <0x49042000 0x400>;

		interrupts = <80>;

		ti,hwmods = "uart4";

		clock-frequency = <48000000>;

		cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>;

		rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;

		dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;

		dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;

		dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

	};

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ Required properties: 
    - "renesas,hscif-r8a7794" for R8A7794 (R-Car E2) HSCIF compatible UART.

    - "renesas,scif-r8a7795" for R8A7795 (R-Car H3) SCIF compatible UART.

    - "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.

    - "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.

    - "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.

    - "renesas,scifa-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFA compatible UART.

    - "renesas,scifb-sh73a0" for SH73A0 (SH-Mobile AG5) SCIFB compatible UART.

    - "renesas,rcar-gen1-scif" for R-Car Gen1 SCIF compatible UART,
@@ -76,6 +78,10 @@ Optional properties: 
  - dmas: Must contain a list of two references to DMA specifiers, one for

	  transmission, and one for reception.

  - dma-names: Must contain a list of two DMA names, "tx" and "rx".

  - {cts,dsr,dcd,rng,rts,dtr}-gpios: Specify GPIOs for modem lines, cfr. the

    generic serial DT bindings in serial.txt.

  - uart-has-rtscts: Indicates dedicated lines for RTS/CTS hardware flow

    control, cfr. the generic serial DT bindings in serial.txt.



Example:

	aliases {

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10003,6 +10003,7 @@ SERIAL DRIVERS 
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-serial@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/serial/

F:	drivers/tty/serial/



SYNOPSYS DESIGNWARE DMAC DRIVER

arch/frv/include/asm/serial.h

+0 −4
Original line number Diff line number Diff line
@@ -12,7 +12,3 @@ 
 * the base baud is derived from the clock speed and so is variable

 */

#define BASE_BAUD 0
 


#define STD_COM_FLAGS		UPF_BOOT_AUTOCONF



#define SERIAL_PORT_DFNS

arch/xtensa/platforms/xt2000/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ void platform_heartbeat(void) 
}



//#define RS_TABLE_SIZE 2

//#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF|UPF_SKIP_TEST)



#define _SERIAL_PORT(_base,_irq)					\

{									\