ARM: dts: STiH407-family: Use new Pinctrl groups

Having just defined some new Pinctrl groups for when HW flow-control
is {en,dis}abled, let's reference them for use within the driver.

Acked-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index c8b2944e304ac6dfdfdacbc3d1b63ab12e7ad73f..e480e329aaa4bfaa1d7f2c57c7976932ee086e5a 100644 (file)
--- 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/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts
index fa16abac0e4dfa719e74c068be11bb3b0e57dcd8..cbcbcb4c6e4fb78042f37a782620255d734edc3e 100644 (file)
--- a/arch/arm/boot/dts/stih410-b2260.dts
+++ b/arch/arm/boot/dts/stih410-b2260.dts
@@ -62,8 +62,11 @@
                /* Low speed expansion connector */
                uart0: serial@9830000 {
                        label = "LS-UART0";
-                       status = "okay";
+                       pinctrl-names = "default", "no-hw-flowctrl";
+                       pinctrl-0 = <&pinctrl_serial0_hw_flowctrl>;
+                       pinctrl-1 = <&pinctrl_serial0>;
                        rts-gpios = <&pio17 3 GPIO_ACTIVE_LOW>;
+                       status = "okay";
                };
 
                /* Low speed expansion connector */