Commit c2078402 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.3-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/serial driver update for 4.3-rc1.

  Not many major things, a number of driver updates and changes, and the
  8250 driver got split up a bit to make it easier to work with by
  moving some functions to a new file.  Full details are in the
  shortlog.

  All have been in linux-next with no reported issues"

* tag 'tty-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (90 commits)
  serial: imx: save and restore context in the suspend path
  serial: imx: allow waking up on RTSD
  serial: imx: introduce serial_imx_enable_wakeup()
  serial: imx: remove unbalanced clk_prepare
  serial: 8250: move rx_running out of the bitfield
  tty: serial: 8250_omap: do not use RX DMA if pause is not supported
  serial:8250_dw: do not alter CTS and DCTS since AFE is enabled
  tty: serial: men_z135_uart.c: Don't initialize port->lock
  tty: serial: men_z135_uart.c: Fix race between IRQ and set_termios()
  serial: 8250: bind to ALi Fast Infrared Controller (ALI5123)
  serial: 8250: don't bind to SMSC IrCC IR port
  serial: mxs-auart: fix baud rate range
  serial: mxs-auart: keep the AUART unit in reset state when not in use
  serial: mxs-auart: use a function name to reflect what it really does
  serial: 8250_pci: fix mode after S3/S4 resume for F81504/508/512
  sc16is7xx: constify devtype
  sc16is7xx: support multiple devices
  sc16is7xx: save and use per-chip line number
  uart: pl011: Add support to ZTE ZX296702 uart
  uart: pl011: Improve LCRH register access decision
  ...
parents 2f37d65a c868cbb7

Documentation/devicetree/bindings/serial/atmel-usart.txt

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Optional properties: 
		memory peripheral interface and USART DMA channel ID, FIFO configuration.

		Refer to dma.txt and atmel-dma.txt for details.

	- dma-names: "rx" for RX channel, "tx" for TX channel.

- atmel,fifo-size: maximum number of data the RX and TX FIFOs can store for FIFO

  capable USARTs.



<chip> compatible description:

- at91rm9200:  legacy USART support
@@ -57,4 +59,5 @@ Example: 
		dmas = <&dma0 2 0x3>,

		       <&dma0 2 0x204>;

		dma-names = "tx", "rx";

		atmel,fifo-size = <32>;

	};

Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
- interrupts: device interrupt



Optional properties:

- {dtr,dsr,ri,cd}-gpios: specify a GPIO for DTR/DSR/RI/CD

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

  line respectively.



Example:
@@ -16,4 +16,8 @@ serial@b00260000 { 
	reg = <0xb0026000 0x1000>;

	interrupts = <68>;

	status = "disabled";

	dtr-gpios = <&sysgpio 0 GPIO_ACTIVE_LOW>;

	dsr-gpios = <&sysgpio 1 GPIO_ACTIVE_LOW>;

	rng-gpios = <&sysgpio 2 GPIO_ACTIVE_LOW>;

	dcd-gpios = <&sysgpio 3 GPIO_ACTIVE_LOW>;

};

Documentation/devicetree/bindings/serial/omap_serial.txt

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ Required properties: 
- compatible : should be "ti,omap2-uart" for OMAP2 controllers

- compatible : should be "ti,omap3-uart" for OMAP3 controllers

- compatible : should be "ti,omap4-uart" for OMAP4 controllers

- compatible : should be "ti,am4372-uart" for AM437x controllers

- compatible : should be "ti,am3352-uart" for AM335x controllers

- compatible : should be "ti,dra742-uart" for DRA7x controllers

- reg : address and length of the register space

- interrupts or interrupts-extended : Should contain the uart interrupt

                                      specifier or both the interrupt

arch/arm/boot/dts/am33xx.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ 
		};



		uart0: serial@44e09000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart1";

			clock-frequency = <48000000>;

			reg = <0x44e09000 0x2000>;
@@ -221,7 +221,7 @@ 
		};



		uart1: serial@48022000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart2";

			clock-frequency = <48000000>;

			reg = <0x48022000 0x2000>;
@@ -232,7 +232,7 @@ 
		};



		uart2: serial@48024000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart3";

			clock-frequency = <48000000>;

			reg = <0x48024000 0x2000>;
@@ -243,7 +243,7 @@ 
		};



		uart3: serial@481a6000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart4";

			clock-frequency = <48000000>;

			reg = <0x481a6000 0x2000>;
@@ -252,7 +252,7 @@ 
		};



		uart4: serial@481a8000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart5";

			clock-frequency = <48000000>;

			reg = <0x481a8000 0x2000>;
@@ -261,7 +261,7 @@ 
		};



		uart5: serial@481aa000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart6";

			clock-frequency = <48000000>;

			reg = <0x481aa000 0x2000>;

arch/arm/boot/dts/dra7.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ 
		};



		uart1: serial@4806a000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x4806a000 0x100>;

			interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart1";
@@ -408,7 +408,7 @@ 
		};



		uart2: serial@4806c000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x4806c000 0x100>;

			interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart2";
@@ -419,7 +419,7 @@ 
		};



		uart3: serial@48020000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48020000 0x100>;

			interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart3";
@@ -430,7 +430,7 @@ 
		};



		uart4: serial@4806e000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x4806e000 0x100>;

			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart4";
@@ -441,7 +441,7 @@ 
		};



		uart5: serial@48066000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48066000 0x100>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart5";
@@ -452,7 +452,7 @@ 
		};



		uart6: serial@48068000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48068000 0x100>;

			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart6";
@@ -463,7 +463,7 @@ 
		};



		uart7: serial@48420000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48420000 0x100>;

			interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart7";
@@ -472,7 +472,7 @@ 
		};



		uart8: serial@48422000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48422000 0x100>;

			interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart8";
@@ -481,7 +481,7 @@ 
		};



		uart9: serial@48424000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x48424000 0x100>;

			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart9";
@@ -490,7 +490,7 @@ 
		};



		uart10: serial@4ae2b000 {

			compatible = "ti,omap4-uart";

			compatible = "ti,dra742-uart", "ti,omap4-uart";

			reg = <0x4ae2b000 0x100>;

			interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "uart10";

CRA Git | Maintained and supported by SUSTech CRA and CCSE