ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file

This patch moves out the sdcc1 pinctrl nodes out of board files to soc file,
so that it will be duplicated in other board files.

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
index 4102a98f475b648a2b50c7a6e04ea42d4cf12bfd..ca683e56b8877dbf2bc87402c592852a63da1922 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -7,6 +7,26 @@
                };
        };
 
+       sdcc1_pins: sdcc1-pin-active {
+               clk {
+                       pins = "sdc1_clk";
+                       drive-strengh = <16>;
+                       bias-disable;
+               };
+
+               cmd {
+                       pins = "sdc1_cmd";
+                       drive-strengh = <10>;
+                       bias-pull-up;
+               };
+
+               data {
+                       pins = "sdc1_data";
+                       drive-strengh = <10>;
+                       bias-pull-up;
+               };
+       };
+
        ps_hold: ps_hold {
                mux {
                        pins = "gpio78";

diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
index 06b3c76c3e4102e9ad48fd76b47f22dcd440e41e..93d08b9a77c938d29dcb67dd75ef25687979abb7 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
@@ -70,25 +70,6 @@
                                };
                        };
 
-                       sdcc1_pin_a: sdcc1-pin-active {
-                               clk {
-                                       pins = "sdc1_clk";
-                                       drive-strengh = <16>;
-                                       bias-disable;
-                               };
-
-                               cmd {
-                                       pins = "sdc1_cmd";
-                                       drive-strengh = <10>;
-                                       bias-pull-up;
-                               };
-
-                               data {
-                                       pins = "sdc1_data";
-                                       drive-strengh = <10>;
-                                       bias-pull-up;
-                               };
-                       };
 
                        sdcc3_pin_a: sdcc3-pin-active {
                                clk {
@@ -417,9 +398,6 @@
 
                                vmmc-supply = <&pm8921_l5>;
                                vqmmc-supply = <&pm8921_s4>;
-
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&sdcc1_pin_a>;
                        };
 
                        sdcc3: sdcc@12180000 {

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index cf37d55f6e74f43448071252e0c87a28b476ef34..ce7ce846615e8fd22c3f3c8a1abf992c042f2e28 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -859,6 +859,8 @@
                        sdcc1: sdcc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
+                               pinctrl-names   = "default";
+                               pinctrl-0       = <&sdcc1_pins>;
                                arm,primecell-periphid = <0x00051180>;
                                reg             = <0x12400000 0x2000>;
                                interrupts      = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;