ARM: dts: apq8064: move pinctrls to dedicated dtsi

As there are more pinctrls to come, moving these to dedicated dtsi makes
more sense.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
new file mode 100644 (file)
index 0000000..ae5fd21
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -0,0 +1,73 @@
+
+&tlmm_pinmux {
+       sdc4_gpios: sdc4-gpios {
+               pios {
+                       pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
+                       function = "sdc4";
+               };
+       };
+
+       hdmi_pinctrl: hdmi-pinctrl {
+               mux1 {
+                       pins = "gpio69", "gpio70", "gpio71";
+                               function = "hdmi";
+                               bias-pull-up;
+                               drive-strength = <2>;
+                       };
+                       mux2 {
+                               pins = "gpio72";
+                               function = "hdmi";
+                               bias-pull-down;
+                               drive-strength = <16>;
+                       };
+       };
+
+       ps_hold: ps_hold {
+               mux {
+                       pins = "gpio78";
+                       function = "ps_hold";
+               };
+       };
+
+       i2c1_pins: i2c1 {
+               mux {
+                       pins = "gpio20", "gpio21";
+                       function = "gsbi1";
+               };
+       };
+
+       i2c3_pins: i2c3 {
+               mux {
+                       pins = "gpio8", "gpio9";
+                       function = "gsbi3";
+               };
+       };
+
+       gsbi6_uart_2pins: gsbi6_uart_2pins {
+               mux {
+                       pins = "gpio14", "gpio15";
+                       function = "gsbi6";
+               };
+       };
+
+       gsbi6_uart_4pins: gsbi6_uart_4pins {
+               mux {
+                       pins = "gpio14", "gpio15", "gpio16", "gpio17";
+                       function = "gsbi6";
+               };
+       };
+
+       gsbi7_uart_2pins: gsbi7_uart_2pins {
+               mux {
+                       pins = "gpio82", "gpio83";
+                       function = "gsbi7";
+               };
+       };
+
+       gsbi7_uart_4pins: gsbi7_uart_4pins {
+               mux {
+                       pins = "gpio82", "gpio83", "gpio84", "gpio85";
+                       function = "gsbi7";
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 6fa619737d40ec312b77538428349c8be98b0f25..0d6f42536f3b10b624ca9bceb4dac7cf32d89d79 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -810,76 +810,6 @@
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&ps_hold>;
 
                        pinctrl-names = "default";
                        pinctrl-0 = <&ps_hold>;

-
-                       sdc4_gpios: sdc4-gpios {
-                               pios {
-                                       pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
-                                       function = "sdc4";
-                               };
-                       };
-
-                       hdmi_pinctrl: hdmi-pinctrl {
-                               mux1 {
-                                       pins = "gpio69", "gpio70", "gpio71";
-                                       function = "hdmi";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-                               mux2 {
-                                       pins = "gpio72";
-                                       function = "hdmi";
-                                       bias-pull-down;
-                                       drive-strength = <16>;
-                               };
-                       };
-                       ps_hold: ps_hold {
-                               mux {
-                                       pins = "gpio78";
-                                       function = "ps_hold";
-                               };
-                       };
-
-                       i2c1_pins: i2c1 {
-                               mux {
-                                       pins = "gpio20", "gpio21";
-                                       function = "gsbi1";
-                               };
-                       };
-
-                       i2c3_pins: i2c3 {
-                               mux {
-                                       pins = "gpio8", "gpio9";
-                                       function = "gsbi3";
-                               };
-                       };
-
-                       gsbi6_uart_2pins: gsbi6_uart_2pins {
-                               mux {
-                                       pins = "gpio14", "gpio15";
-                                       function = "gsbi6";
-                               };
-                       };
-
-                       gsbi6_uart_4pins: gsbi6_uart_4pins {
-                               mux {
-                                       pins = "gpio14", "gpio15", "gpio16", "gpio17";
-                                       function = "gsbi6";
-                               };
-                       };
-
-                       gsbi7_uart_2pins: gsbi7_uart_2pins {
-                               mux {
-                                       pins = "gpio82", "gpio83";
-                                       function = "gsbi7";
-                               };
-                       };
-
-                       gsbi7_uart_4pins: gsbi7_uart_4pins {
-                               mux {
-                                       pins = "gpio82", "gpio83", "gpio84", "gpio85";
-                                       function = "gsbi7";
-                               };
-                       };

                };
 
                sfpb_wrapper_mutex: syscon@1200000 {
                };
 
                sfpb_wrapper_mutex: syscon@1200000 {


@@ -1786,3 +1716,4 @@
 };
 
 #include "qcom-apq8064-coresight.dtsi"
 };
 
 #include "qcom-apq8064-coresight.dtsi"

+#include "qcom-apq8064-pins.dtsi"