ARM: dts: move hdmi pinctrl out of board file.

This patch moves hdmi pinctrl defination from board file to soc level
pinctrl file. If not this pinctrl setup will be duplicated across all
the apq8064 based board files.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 3d37cab3b9a9cb5c9a9f8dcd314c059fc9b1545a..881ce707311a05e35160456e76bf564863ea0895 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -75,25 +75,6 @@
                                        bias-disable;
                                };
                        };
-
-                       hdmi_pinctrl: hdmi-pinctrl {
-                               mux {
-                                       pins = "gpio70", "gpio71", "gpio72";
-                                       function = "hdmi";
-                               };
-
-                               pinconf_ddc {
-                                       pins = "gpio70", "gpio71";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf_hpd {
-                                       pins = "gpio72";
-                                       bias-pull-down;
-                                       drive-strength = <16>;
-                               };
-                       };
                };
 
                rpm@108000 {
@@ -368,9 +349,6 @@
 
                        hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&hdmi_pinctrl>;
-
                        ports {
                                port@0 {
                                        endpoint {

diff --git a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
index 5c023e649882bd257a186b7378f9770d9b9cf597..173ab7c299cea326055e1fa6cc9da27018895b89 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -302,4 +302,23 @@
                drive-strength = <6>;
                bias-pull-down;
        };
+
+       hdmi_pinctrl: hdmi-pinctrl {
+               mux {
+                       pins = "gpio70", "gpio71", "gpio72";
+                       function = "hdmi";
+               };
+
+               pinconf_ddc {
+                       pins = "gpio70", "gpio71";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf_hpd {
+                       pins = "gpio72";
+                       bias-pull-down;
+                       drive-strength = <16>;
+               };
+       };
 };

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 03f98cb7763bc652f6ee0d09096e35c5fa5f6f3e..308a8cd7d970eeb1570dc66b48991e7b5ae1e23c 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1355,6 +1355,8 @@
 
                hdmi: hdmi-tx@4a00000 {
                        compatible = "qcom,hdmi-tx-8960";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&hdmi_pinctrl>;
                        reg = <0x04a00000 0x2f0>;
                        reg-names = "core_physical";
                        interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;