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

Commit 2f01ea90 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tty/serial driver patches from Greg KH:
 "Here's the big tty/serial driver pull request for 3.12-rc1.

  Lots of n_tty reworks to resolve some very long-standing issues,
  removing the 3-4 different locks that were taken for every character.
  This code has been beaten on for a long time in linux-next with no
  reported regressions.

  Other than that, a range of serial and tty driver updates and
  revisions.  Full details in the shortlog"

* tag 'tty-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (226 commits)
  hvc_xen: Remove unnecessary __GFP_ZERO from kzalloc
  serial: imx: initialize the local variable
  tty: ar933x_uart: add device tree support and binding documentation
  tty: ar933x_uart: allow to build the driver as a module
  ARM: dts: msm: Update uartdm compatible strings
  devicetree: serial: Document msm_serial bindings
  serial: unify serial bindings into a single dir
  serial: fsl-imx-uart: Cleanup duplicate device tree binding
  tty: ar933x_uart: use config_enabled() macro to clean up ifdefs
  tty: ar933x_uart: remove superfluous assignment of ar933x_uart_driver.nr
  tty: ar933x_uart: use the clk API to get the uart clock
  tty: serial: cpm_uart: Adding proper request of GPIO used by cpm_uart driver
  serial: sirf: fix the amount of serial ports
  serial: sirf: define macro for some magic numbers of USP
  serial: icom: move array overflow checks earlier
  TTY: amiserial, remove unnecessary platform_set_drvdata()
  serial: st-asc: remove unnecessary platform_set_drvdata()
  msm_serial: Send more than 1 character on the console w/ UARTDM
  msm_serial: Add support for non-GSBI UARTDM devices
  msm_serial: Switch clock consumer strings and simplify code
  ...
parents 75114427 2d1d3f3a

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

+17 −1
Original line number Diff line number Diff line
@@ -10,13 +10,18 @@ Required properties: 
Optional properties:

- atmel,use-dma-rx: use of PDC or DMA for receiving data

- atmel,use-dma-tx: use of PDC or DMA for transmitting data

- add dma bindings for dma transfer:

	- dmas: DMA specifier, consisting of a phandle to DMA controller node,

		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.



<chip> compatible description:

- at91rm9200:  legacy USART support

- at91sam9260: generic USART implementation for SAM9 SoCs



Example:



- use PDC:

	usart0: serial@fff8c000 {

		compatible = "atmel,at91sam9260-usart";

		reg = <0xfff8c000 0x4000>;
@@ -25,3 +30,14 @@ Example: 
		atmel,use-dma-tx;

	};



- use DMA:

	usart0: serial@f001c000 {

		compatible = "atmel,at91sam9260-usart";

		reg = <0xf001c000 0x100>;

		interrupts = <12 4 5>;

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		dmas = <&dma0 2 0x3>,

		       <&dma0 2 0x204>;

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

	};

Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

+8 −14
Original line number Diff line number Diff line 
* Freescale i.MX UART controller

* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART)



Required properties:

- compatible : should be "fsl,imx21-uart"

- compatible : Should be "fsl,<soc>-uart"

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

- interrupts : Should contain UART interrupt number

- interrupts : Should contain uart interrupt



Optional properties:

- fsl,uart-has-rtscts: indicate that RTS/CTS signals are used

- fsl,uart-has-rtscts : Indicate the uart has rts and cts

- fsl,irda-mode : Indicate the uart supports irda mode

- fsl,dte-mode : Indicate the uart works in DTE mode. The uart works

                  is DCE mode by default.



Note: Each uart controller should have an alias correctly numbered

in "aliases" node.



Example:



- From imx51.dtsi:

aliases {

	serial0 = &uart1;

	serial1 = &uart2;

	serial2 = &uart3;

};



uart1: serial@73fbc000 {

	compatible = "fsl,imx51-uart", "fsl,imx21-uart";

	reg = <0x73fbc000 0x4000>;

	interrupts = <31>;

	status = "disabled";

}



- From imx51-babbage.dts:

uart1: serial@73fbc000 {

	fsl,uart-has-rtscts;

	status = "okay";

	fsl,dte-mode;

};