diff options
| author | Kumar Gala <galak@codeaurora.org> | 2013-08-28 21:08:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 01:02:48 +0200 |
| commit | 3e6648c9c812f11117590ef846b205abd0224699 (patch) | |
| tree | 058fcc1923b1a70d43925c7660bd6f530c4f1a35 /Documentation/devicetree/bindings/serial | |
| parent | tty: ar933x_uart: use config_enabled() macro to clean up ifdefs (diff) | |
| download | linux-3e6648c9c812f11117590ef846b205abd0224699.tar.xz linux-3e6648c9c812f11117590ef846b205abd0224699.zip | |
serial: fsl-imx-uart: Cleanup duplicate device tree binding
We had two bindings for the same serial device, it looks like the one in
tty/serial/fsl-imx-uart.txt is the more up to date one so go with it and
merge a few things about the use/need for aliases in from
serial/fsl-imx-uart.txt.
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/serial')
| -rw-r--r-- | Documentation/devicetree/bindings/serial/fsl-imx-uart.txt | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt deleted file mode 100644 index c58573b5b1a4..000000000000 --- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt +++ /dev/null @@ -1,35 +0,0 @@ -* Freescale i.MX UART controller - -Required properties: -- compatible : should be "fsl,imx21-uart" -- reg : Address and length of the register set for the device -- interrupts : Should contain UART interrupt number - -Optional properties: -- fsl,uart-has-rtscts: indicate that RTS/CTS signals are used - -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"; -}; - |