leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Geert Uytterhoeven 2016-04-22 17:22:24 +02:00 committed by Greg Kroah-Hartman
parent af99c187f1
commit 7f60830ab1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/devicetree/bindings/serial/sirf-uart.txt
View File

@ -9,9 +9,9 @@ Required properties:
- clocks : Should contain uart clock number - clocks : Should contain uart clock number
Optional properties: Optional properties:
- sirf,uart-has-rtscts: we have hardware flow controller pins in hardware - 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 - rts-gpios: RTS pin for USP-based UART if uart-has-rtscts is true
- cts-gpios: CTS pin for USP-based UART if sirf,uart-has-rtscts is true - cts-gpios: CTS pin for USP-based UART if uart-has-rtscts is true
Example: Example:
@ -28,7 +28,7 @@ On the board-specific dts, we can put rts-gpios and cts-gpios like
usp@b0090000 { usp@b0090000 {
compatible = "sirf,prima2-usp-uart"; compatible = "sirf,prima2-usp-uart";
sirf,uart-has-rtscts; uart-has-rtscts;
rts-gpios = <&gpio 15 0>; rts-gpios = <&gpio 15 0>;
cts-gpios = <&gpio 46 0>; cts-gpios = <&gpio 46 0>;
}; };

3
drivers/tty/serial/sirfsoc_uart.c
View File

@ -1293,7 +1293,8 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
sirfport->uart_reg = (struct sirfsoc_uart_register *)match->data; sirfport->uart_reg = (struct sirfsoc_uart_register *)match->data;
sirfport->hw_flow_ctrl = 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") || if (of_device_is_compatible(np, "sirf,prima2-uart") ||
of_device_is_compatible(np, "sirf,atlas7-uart")) of_device_is_compatible(np, "sirf,atlas7-uart"))
sirfport->uart_reg->uart_type = SIRF_REAL_UART; sirfport->uart_reg->uart_type = SIRF_REAL_UART;