3 files changed, 16 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 4c72dae2aefa..0fe03cb88628 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -222,9 +222,8 @@
                         compatible = "st,asc";
                         reg = <0x9830000 0x2c>;
                         interrupts = <GIC_SPI 122 IRQ_TYPE_NONE>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_serial0>;
                         clocks = <&clk_s_c0_flexgen CLK_EXT2F_A9>;
+                        /* Pinctrl moved out to a per-board configuration */
 
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi
index daab16b5ae64..bd1a82e8fffe 100644
--- a/arch/arm/boot/dts/stih407-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi
@@ -465,8 +465,16 @@
                         serial0 {
                                 pinctrl_serial0: serial0-0 {
                                         st,pins {
-                                                tx = <&pio17 0 ALT1 OUT>;
-                                                rx = <&pio17 1 ALT1 IN>;
+                                                tx =  <&pio17 0 ALT1 OUT>;
+                                                rx =  <&pio17 1 ALT1 IN>;
+                                        };
+                                };
+                                pinctrl_serial0_hw_flowctrl: serial0-0_hw_flowctrl {
+                                        st,pins {
+                                                tx =  <&pio17 0 ALT1 OUT>;
+                                                rx =  <&pio17 1 ALT1 IN>;
+                                                cts = <&pio17 2 ALT1 IN>;
+                                                rts = <&pio17 3 ALT1 OUT>;
                                         };
                                 };
                         };
diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index 06b0696cb6b8..93c14d183e29 100644
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -62,6 +62,11 @@
                 /* Low speed expansion connector */
                 uart0: serial@9830000 {
                         label = "LS-UART0";
+                        pinctrl-names = "default", "no-hw-flowctrl";
+                        pinctrl-0 = <&pinctrl_serial0_hw_flowctrl>;
+                        pinctrl-1 = <&pinctrl_serial0>;
+                        rts-gpios = <&pio17 3 GPIO_ACTIVE_LOW>;
+                        uart-has-rtscts;
                         status = "okay";
                 };