ARM: ux500: Configure regulator for I/O voltage for SD-card slot

To be able to enable SDR12|25 for SD-cards, we needed to fixup the
configuration in DT of the gpio regulator, which handles the signal
voltage level. Some configuration were missing and some were wrong.

Cc: Lee Jones <lee.jones@linaro.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index af9914e3b2191cd8059d5522dd7dee75cb19ce1d..40f0ecdf9303ca2c9db18ef5180bd0afb23564ca 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -68,8 +68,6 @@
                vmmci: regulator-gpio {
                        gpios = <&tc3589x_gpio 18 0x4>;
                        enable-gpio = <&tc3589x_gpio 17 0x4>;
-
-                       status = "okay";
                };
 
                pinctrl {

diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 1f7b46bb87afbabd47da0bec4ec358c026817ece..3b6d1181939bc118f6980b583084367c3d395a73 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -22,6 +22,11 @@
                        cd-gpios  = <&gpio2 31 0x4>; // 95
                };
 
+               vmmci: regulator-gpio {
+                       gpios = <&gpio0 5 0x4>;
+                       enable-gpio = <&gpio5 9 0x4>;
+               };
+
                pinctrl {
                        /*
                         * Set this up using hogs, as time goes by and as seems fit, these

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 9070c3701c89172f28fb71740473c0345fa48e70..97d5d21b7db7c2bdb416c064ef389b3425f82b41 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -146,10 +146,8 @@
                };
 
                vmmci: regulator-gpio {
-                       gpios = <&gpio6 25 0x4>;
-                       enable-gpio = <&gpio7 4 0x4>;
-
-                       status = "okay";
+                       gpios = <&gpio7 4 0x4>;
+                       enable-gpio = <&gpio6 25 0x4>;
                };
 
                // External Micro SD slot