diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:27 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:49 +0200 |
commit | a3f8612700507a10ad7186fd77e9f46c7af88335 (patch) | |
tree | f00be0b726748113ffeb4e1caf7ade7ef33cfabe /Documentation/devicetree/bindings/tty/serial | |
parent | 8ecada16512c90ae782b00f15ebff0c32e4cd92a (diff) | |
parent | 07bc9dc1b01bad7084fed3d2659e5d83317869bc (diff) | |
download | linux-stable-a3f8612700507a10ad7186fd77e9f46c7af88335.tar.gz linux-stable-a3f8612700507a10ad7186fd77e9f46c7af88335.tar.bz2 linux-stable-a3f8612700507a10ad7186fd77e9f46c7af88335.zip |
Merge branch 'master' into for-next
Sync with Linus' master to be able to apply
trivial patche to newer code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/devicetree/bindings/tty/serial')
-rw-r--r-- | Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt | 3 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt index b462d0c54823..c662eb36be29 100644 --- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt @@ -8,6 +8,8 @@ Required properties: Optional properties: - 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. Example: @@ -16,4 +18,5 @@ serial@73fbc000 { reg = <0x73fbc000 0x4000>; interrupts = <31>; fsl,uart-has-rtscts; + fsl,dte-mode; }; diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt new file mode 100644 index 000000000000..6fd1dd1638dd --- /dev/null +++ b/Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt @@ -0,0 +1,14 @@ +* Freescale low power universal asynchronous receiver/transmitter (lpuart) + +Required properties: +- compatible : Should be "fsl,<soc>-lpuart" +- reg : Address and length of the register set for the device +- interrupts : Should contain uart interrupt + +Example: + +uart0: serial@40027000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40027000 0x1000>; + interrupts = <0 61 0x00>; + }; |