serial: mxs-auart: Use generic uart-has-rtscts DT property

Convert the Freescale MXS AUART 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 it is deprecated.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
index 81e35cd2c58ae28c1d3bd65c51b5aa66c32edc15..5c96d41899f19532eda9e9bff2be34ebce97ce4c 100644 (file)
--- a/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
+++ b/Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
@@ -19,7 +19,7 @@ Required properties for "alphascale,asm9260-auart":
        "ahb" - ahb gate.
 
 Optional properties:
-- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines
+- uart-has-rtscts : Indicate the UART has RTS and CTS lines
   for hardware flow control,
        it also means you enable the DMA support for this UART.
 - {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 68a6e9520990b4fb55898e90fcae57c2296cc531..eb54e5c77ead0bc637a1a03d1fbd447628e0c916 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1570,7 +1570,8 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s,
        }
        s->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 */)
                set_bit(MXS_AUART_RTSCTS, &s->flags);
 
        return 0;