ARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes

Some UART nodes on the A20 DTSI do not share the same pattern that we use
everywhere else, with the RTS and CTS pins split away from the TX and RX
pins. Make those pin groups consistent with the rest of our DT.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 9ce59d49cf496116d01255be2341bc0cad4817d2..a1af7d6726e2c4ab9060da4c773ec693558929a7 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -215,13 +215,13 @@
 
 &uart2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart2_pi_pins>;
+       pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
        status = "okay";
 };
 
 &uart3 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pg_pins>;
+       pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
index a8d15d01ac1a5229d7b60fe3bdb30b5565bd7adb..b4143a91086b7a81e3c5abd8796c3787c872852e 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts
+++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts
@@ -173,7 +173,7 @@
 
 &uart2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart2_pi_pins>;
+       pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 75669fc51de5eec75661595b59309e19597baf8d..bffd3a21bee3dbbd64760d8d249617ce50d7d63c 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -935,12 +935,22 @@
                        };
 
                        uart2_pi_pins: uart2-pi-pins {
-                               pins = "PI16", "PI17", "PI18", "PI19";
+                               pins = "PI18", "PI19";
+                               function = "uart2";
+                       };
+
+                       uart2_cts_rts_pi_pins: uart2-cts-rts-pi-pins {
+                               pins = "PI16", "PI17";
                                function = "uart2";
                        };
 
                        uart3_pg_pins: uart3-pg-pins {
-                               pins = "PG6", "PG7", "PG8", "PG9";
+                               pins = "PG6", "PG7";
+                               function = "uart3";
+                       };
+
+                       uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins {
+                               pins = "PG8", "PG9";
                                function = "uart3";
                        };