From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Rutland Subject: Re: [PATCH 1/2] serial: fsl-imx-uart: Cleanup duplicate device tree binding Date: Mon, 2 Sep 2013 12:40:16 +0100 Message-ID: <20130902114016.GA13303@e106331-lin.cambridge.arm.com> References: <1377716903-19699-1-git-send-email-galak@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1377716903-19699-1-git-send-email-galak@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org To: Kumar Gala Cc: "rob.herring@calxeda.com" , Pawel Moll , Stephen Warren , Ian Campbell , "gregkh@linuxfoundation.org" , "devicetree@vger.kernel.org" , "linux-serial@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "fabio.estevam@freescale.com" , "s.hauer@pengutronix.de" , "shawn.guo@linaro.org" List-Id: devicetree@vger.kernel.org On Wed, Aug 28, 2013 at 08:08:22PM +0100, Kumar Gala wrote: > 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. Oh my, that's a mess. >=20 > Signed-off-by: Kumar Gala > --- > .../devicetree/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 >=20 > diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.tx= t b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt > deleted file mode 100644 > index c58573b..0000000 > --- 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 =3D &uart1; > - serial1 =3D &uart2; > - serial2 =3D &uart3; > -}; > - > -uart1: serial@73fbc000 { > - compatible =3D "fsl,imx51-uart", "fsl,imx21-uart"; > - reg =3D <0x73fbc000 0x4000>; > - interrupts =3D <31>; > - status =3D "disabled"; > -} > - > -- From imx51-babbage.dts: > -uart1: serial@73fbc000 { > - fsl,uart-has-rtscts; > - status =3D "okay"; > -}; > - > diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uar= t.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt > index c662eb3..35ae1fb 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: I note this binding doesn't actually define the set of compatible strings, as it has: Compatible : Should be "fsl,-uart" =2E.. the other binding had: compatible : should be "fsl,imx21-uart" =2E. and the driver accepts "fsl,imx21-uart" and "fsl,imx1-uart". Would it be possible to clarify this at the same time, something like: Compatible : Should contain one of: * "fsl,imx21-uart" for UARTs compatible with that in i.MX21 SoCs. * "fsl,imx1-uart" for UARTs compatible with that in i.MX1x SoCs=C2=B7. Otherwise, this seems sensible. With something like the above: Acked-by: Mark Rutland Cheers, Mark. > - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works > is DCE mode by default. > =20 > +Note: Each uart controller should have an alias correctly numbered > +in "aliases" node. > + > Example: > =20 > -serial@73fbc000 { > +aliases { > + serial0 =3D &uart1; > +}; > + > +uart1: serial@73fbc000 { > compatible =3D "fsl,imx51-uart", "fsl,imx21-uart"; > reg =3D <0x73fbc000 0x4000>; > interrupts =3D <31>; > --=20 > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora F= orum, > hosted by The Linux Foundation >=20 >=20