serial: sirf: Use generic uart-has-rtscts DT property

Convert the SiRF UART driver from using the vendor-specific
"sirf,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>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/serial/sirf-uart.txt b/Documentation/devicetree/bindings/serial/sirf-uart.txt
index 67e2a0aeb0429572a3b6604b8e1100a2b84d4b72..1e48bbbeecc6dd277d21bfc67a8ea7393480aa41 100644 (file)
--- a/Documentation/devicetree/bindings/serial/sirf-uart.txt
+++ b/Documentation/devicetree/bindings/serial/sirf-uart.txt
@@ -9,9 +9,9 @@ Required properties:
 - clocks : Should contain uart clock number
 
 Optional properties:
-- sirf,uart-has-rtscts: we have hardware flow controller pins in hardware
-- rts-gpios: RTS pin for USP-based UART if sirf,uart-has-rtscts is true
-- cts-gpios: CTS pin for USP-based UART if sirf,uart-has-rtscts is true
+- uart-has-rtscts: we have hardware flow controller pins in hardware
+- rts-gpios: RTS pin for USP-based UART if uart-has-rtscts is true
+- cts-gpios: CTS pin for USP-based UART if uart-has-rtscts is true
 
 Example:
 
@@ -28,7 +28,7 @@ On the board-specific dts, we can put rts-gpios and cts-gpios like
 
 usp@b0090000 {
        compatible = "sirf,prima2-usp-uart";
-       sirf,uart-has-rtscts;
+       uart-has-rtscts;
        rts-gpios = <&gpio 15 0>;
        cts-gpios = <&gpio 46 0>;
 };

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1d1c0b9857ff690098873263434e3d423db1790b..b186c9c4f850cc169b27bc7a2ee75127407c5ab9 100644 (file)
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -1293,7 +1293,8 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
        sirfport->uart_reg = (struct sirfsoc_uart_register *)match->data;
 
        sirfport->hw_flow_ctrl =
-               of_property_read_bool(np, "sirf,uart-has-rtscts");
+               of_property_read_bool(np, "uart-has-rtscts") ||
+               of_property_read_bool(np, "sirf,uart-has-rtscts") /* deprecated */;
        if (of_device_is_compatible(np, "sirf,prima2-uart") ||
                of_device_is_compatible(np, "sirf,atlas7-uart"))
                sirfport->uart_reg->uart_type = SIRF_REAL_UART;