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

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

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

Pull tty/serial driver update from Greg KH:
 "Here's the big tty/serial driver update for 3.15-rc1.

  Nothing major, a number of serial driver updates and a few tty core
  fixes as well.

  All have been in linux-next for a while"

* tag 'tty-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (71 commits)
  tty/serial: omap: empty the RX FIFO at the end of half-duplex TX
  tty/serial: omap: fix RX interrupt enable/disable in half-duplex TX
  serial: sh-sci: Neaten dev_<level> uses
  serial: sh-sci: Replace hardcoded 3 by UART_PM_STATE_OFF
  serial: sh-sci: Add more register documentation
  serial: sh-sci: Remove useless casts
  serial: sh-sci: Replace printk() by pr_*()
  serial_core: Avoid NULL pointer dereference in uart_close()
  serial_core: Get a reference for port->tty in uart_remove_one_port()
  serial: clps711x: Give a chance to perform useful tasks during wait loop
  serial_core: Grammar s/ports/port's/
  serial_core: Spelling s/contro/control/
  serial: efm32: properly namespace location property
  serial: max310x: Add missing #include <linux/uaccess.h>
  synclink: fix info leak in ioctl
  serial: 8250: Clean up the locking for -rt
  serial: 8250_pci: change BayTrail default uartclk
  serial: 8250_pci: more BayTrail error-free bauds
  serial: sh-sci: Add missing call to uart_remove_one_port() in failure path
  serial_core: Unregister console in uart_remove_one_port()
  ...
parents c12e69c6 3a13884a

Documentation/devicetree/bindings/serial/efm32-uart.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
- interrupts : Should contain uart interrupt



Optional properties:

- location : Decides the location of the USART I/O pins.

- efm32,location : Decides the location of the USART I/O pins.

  Allowed range : [0 .. 5]

  Default: 0
@@ -16,5 +16,5 @@ uart@0x4000c400 { 
	compatible = "efm32,uart";

	reg = <0x4000c400 0x400>;

	interrupts = <15>;

	location = <0>;

	efm32,location = <0>;

};

Documentation/devicetree/bindings/serial/fsl-lpuart.txt

+17 −4
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ Required properties: 
- compatible : Should be "fsl,<soc>-lpuart"

- reg : Address and length of the register set for the device

- interrupts : Should contain uart interrupt

- clocks : phandle + clock specifier pairs, one for each entry in clock-names

- clock-names : should contain: "ipg" - the uart clock



Optional properties:

- dmas: A list of two dma specifiers, one for each entry in dma-names.

- dma-names: should contain "tx" and "rx".



Note: Optional properties for DMA support. Write them both or both not.



Example:
@@ -11,4 +19,9 @@ uart0: serial@40027000 { 
		compatible = "fsl,vf610-lpuart";

		reg = <0x40027000 0x1000>;

		interrupts = <0 61 0x00>;

		clocks = <&clks VF610_CLK_UART0>;

		clock-names = "ipg";

		dmas = <&edma0 0 2>,

			<&edma0 0 3>;

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

	};

Documentation/devicetree/bindings/serial/maxim,max310x.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* Maxim MAX310X advanced Universal Asynchronous Receiver-Transmitter (UART)



Required properties:

- compatible: Should be one of the following:

  - "maxim,max3107" for Maxim MAX3107,

  - "maxim,max3108" for Maxim MAX3108,

  - "maxim,max3109" for Maxim MAX3109,

  - "maxim,max14830" for Maxim MAX14830.

- reg: SPI chip select number.

- interrupt-parent: The phandle for the interrupt controller that

  services interrupts for this IC.

- interrupts: Specifies the interrupt source of the parent interrupt

  controller. The format of the interrupt specifier depends on the

  parent interrupt controller.

- clocks: phandle to the IC source clock.

- clock-names: Should be "xtal" if clock is an external crystal or

  "osc" if an external clock source is used.



Optional properties:

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be two. The first cell is the GPIO number and

  the second cell is used to specify the GPIO polarity:

    0 = active high,

    1 = active low.



Example:

	max14830: max14830@0 {

		compatible = "maxim,max14830";

		reg = <0>;

		clocks = <&clk20m>;

		clock-names = "osc";

		interrupt-parent = <&gpio3>;

		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

		gpio-controller;

		#gpio-cells = <2>;

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Example: 
	};



	scifa0: serial@e6c40000 {

		compatible = "renesas,scifa-r8a7790", "renesas,scifa-generic";

		compatible = "renesas,scifa-r8a7790", "renesas,scifa";

		reg = <0 0xe6c40000 0 64>;

		interrupt-parent = <&gic>;

		interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/atlas6.dtsi

+9 −8
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ 
				interrupts = <17>;

				fifosize = <128>;

				clocks = <&clks 13>;

				sirf,uart-dma-rx-channel = <21>;

				sirf,uart-dma-tx-channel = <2>;

				dmas = <&dmac1 5>, <&dmac0 2>;

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

			};



			uart1: uart@b0060000 {
@@ -228,6 +228,7 @@ 
				interrupts = <18>;

				fifosize = <32>;

				clocks = <&clks 14>;

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

			};



			uart2: uart@b0070000 {
@@ -237,8 +238,8 @@ 
				interrupts = <19>;

				fifosize = <128>;

				clocks = <&clks 15>;

				sirf,uart-dma-rx-channel = <6>;

				sirf,uart-dma-tx-channel = <7>;

				dmas = <&dmac0 6>, <&dmac0 7>;

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

			};



			usp0: usp@b0080000 {
@@ -248,8 +249,8 @@ 
				interrupts = <20>;

				fifosize = <128>;

				clocks = <&clks 28>;

				sirf,usp-dma-rx-channel = <17>;

				sirf,usp-dma-tx-channel = <18>;

				dmas = <&dmac1 1>, <&dmac1 2>;

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

			};



			usp1: usp@b0090000 {
@@ -259,8 +260,8 @@ 
				interrupts = <21>;

				fifosize = <128>;

				clocks = <&clks 29>;

				sirf,usp-dma-rx-channel = <14>;

				sirf,usp-dma-tx-channel = <15>;

				dmas = <&dmac0 14>, <&dmac0 15>;

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

			};



			dmac0: dma-controller@b00b0000 {