From 3e6648c9c812f11117590ef846b205abd0224699 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 28 Aug 2013 14:08:22 -0500 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- .../bindings/serial/fsl-imx-uart.txt | 35 ------------------- .../bindings/tty/serial/fsl-imx-uart.txt | 9 ++++- 2 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt 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"; -}; - diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt index c662eb36be29..35ae1fb3537f 100644 --- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt @@ -11,9 +11,16 @@ Optional properties: - 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: -serial@73fbc000 { +aliases { + serial0 = &uart1; +}; + +uart1: serial@73fbc000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x73fbc000 0x4000>; interrupts = <31>; -- 2.39.5