瀏覽代碼

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>
Geert Uytterhoeven 9 年之前
父節點
當前提交
182cdcb8bb
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt
  2. 2 1
      drivers/tty/serial/mxs-auart.c

+ 1 - 1
Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt

@@ -19,7 +19,7 @@ Required properties for "alphascale,asm9260-auart":
 	"ahb" - ahb gate.
 	"ahb" - ahb gate.
 
 
 Optional properties:
 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,
   for hardware flow control,
 	it also means you enable the DMA support for this UART.
 	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
 - {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD

+ 2 - 1
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;
 	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);
 		set_bit(MXS_AUART_RTSCTS, &s->flags);
 
 
 	return 0;
 	return 0;