Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Geert Uytterhoeven and committed by
Greg Kroah-Hartman
1006ed7e 8d21f244

+4 -3
+2 -2
Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
··· 6 6 - interrupts : Should contain uart interrupt 7 7 8 8 Optional properties: 9 - - fsl,uart-has-rtscts : Indicate the uart has rts and cts 9 + - uart-has-rtscts : Indicate the uart has rts and cts 10 10 - fsl,irda-mode : Indicate the uart supports irda mode 11 11 - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works 12 12 in DCE mode by default. ··· 24 24 compatible = "fsl,imx51-uart", "fsl,imx21-uart"; 25 25 reg = <0x73fbc000 0x4000>; 26 26 interrupts = <31>; 27 - fsl,uart-has-rtscts; 27 + uart-has-rtscts; 28 28 fsl,dte-mode; 29 29 };
+2 -1
drivers/tty/serial/imx.c
··· 1980 1980 } 1981 1981 sport->port.line = ret; 1982 1982 1983 - if (of_get_property(np, "fsl,uart-has-rtscts", NULL)) 1983 + if (of_get_property(np, "uart-has-rtscts", NULL) || 1984 + of_get_property(np, "fsl,uart-has-rtscts", NULL) /* deprecated */) 1984 1985 sport->have_rtscts = 1; 1985 1986 1986 1987 if (of_get_property(np, "fsl,dte-mode", NULL))