| Message ID | 1460636003-3011-3-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 14, 2016 at 02:13:20PM +0200, Geert Uytterhoeven wrote: > Convert the Freescale IMX UART driver from using the vendor-specific > "fsl,uart-has-rtscts" to the generic "uart-has-rtscts" DT property, as > documented by the Generic Serial DT Bindings. > > The old vendor-specific property is still recognized by the driver for > backwards compatibility, but deprecated. You should update the dts files as well. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > Documentation/devicetree/bindings/serial/fsl-imx-uart.txt | 4 ++-- > drivers/tty/serial/imx.c | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt > index ed94c217c98d18a6..1e82802d8e322db5 100644 > --- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt > +++ b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt > @@ -6,7 +6,7 @@ Required properties: > - interrupts : Should contain uart interrupt > > Optional properties: > -- fsl,uart-has-rtscts : Indicate the uart has rts and cts > +- 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 > in DCE mode by default. > @@ -24,6 +24,6 @@ uart1: serial@73fbc000 { > compatible = "fsl,imx51-uart", "fsl,imx21-uart"; > reg = <0x73fbc000 0x4000>; > interrupts = <31>; > - fsl,uart-has-rtscts; > + uart-has-rtscts; > fsl,dte-mode; > }; > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 231e7d5caf6c1845..9fc09d3de1e2428b 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -1927,7 +1927,8 @@ static int serial_imx_probe_dt(struct imx_port *sport, > } > sport->port.line = ret; > > - if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) > + if (of_get_property(np, "uart-has-rtscts", NULL) || > + of_get_property(np, "fsl,uart-has-rtscts", NULL) /* deprecated */) > sport->have_rtscts = 1; > > if (of_get_property(np, "fsl,dte-mode", NULL)) > -- > 1.9.1 >
Hi Rob, On Thu, Apr 14, 2016 at 7:22 PM, Rob Herring <robh@kernel.org> wrote: > On Thu, Apr 14, 2016 at 02:13:20PM +0200, Geert Uytterhoeven wrote: >> Convert the Freescale IMX UART driver from using the vendor-specific >> "fsl,uart-has-rtscts" to the generic "uart-has-rtscts" DT property, as >> documented by the Generic Serial DT Bindings. >> >> The old vendor-specific property is still recognized by the driver for >> backwards compatibility, but deprecated. > > You should update the dts files as well. Indeed. But as I said in the cover letter: "Actual DTS files are to be updated later, after this series has been integrated into mainline." DTS updates typically go through a different path (e.g. arm-soc). RTS/CTS support will be broken if the DTSes are updated before the drivers. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt index ed94c217c98d18a6..1e82802d8e322db5 100644 --- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt +++ b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt @@ -6,7 +6,7 @@ Required properties: - interrupts : Should contain uart interrupt Optional properties: -- fsl,uart-has-rtscts : Indicate the uart has rts and cts +- 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 in DCE mode by default. @@ -24,6 +24,6 @@ uart1: serial@73fbc000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x73fbc000 0x4000>; interrupts = <31>; - fsl,uart-has-rtscts; + uart-has-rtscts; fsl,dte-mode; }; diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 231e7d5caf6c1845..9fc09d3de1e2428b 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1927,7 +1927,8 @@ static int serial_imx_probe_dt(struct imx_port *sport, } sport->port.line = ret; - if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) + if (of_get_property(np, "uart-has-rtscts", NULL) || + of_get_property(np, "fsl,uart-has-rtscts", NULL) /* deprecated */) sport->have_rtscts = 1; if (of_get_property(np, "fsl,dte-mode", NULL))
Convert the Freescale IMX UART driver from using the vendor-specific "fsl,uart-has-rtscts" to the generic "uart-has-rtscts" DT property, as documented by the Generic Serial DT Bindings. The old vendor-specific property is still recognized by the driver for backwards compatibility, but deprecated. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Documentation/devicetree/bindings/serial/fsl-imx-uart.txt | 4 ++-- drivers/tty/serial/imx.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)