ARM: dts: push MMC/SD to board and add comments

This moves the enable-active-high setting from the SoC to the
board for the VMMCQ regulators. It should at least be in the
vicinity of the GPIO line it is defined for.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 48dc38482633741b8f2af052d31ae0ff9785f7f4..1b59943ab6ecebbc9f5bc309d0b21ec88d7adbd4 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -111,6 +111,7 @@ i2c@80110000 {
                        pinctrl-1 = <&i2c3_sleep_mode>;
                };
 
+               /* ST6G3244ME level translator for 1.8/2.9 V */
                vmmci: regulator-gpio {
                        compatible = "regulator-gpio";
 
@@ -120,7 +121,6 @@ vmmci: regulator-gpio {
                        regulator-type = "voltage";
 
                        startup-delay-us = <100>;
-                       enable-active-high;
 
                        states = <1800000 0x1
                                  2900000 0x0>;

diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index ece222d51717c294385fd2edc8960b1ebd6f471b..5882a2606ac3b38d37bb629469955bc949bbd7ce 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -74,6 +74,7 @@ sdi0_per1@80126000 {
                vmmci: regulator-gpio {
                        gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;
                        enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
                };
 
                pinctrl {

diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 7187676836beb4c5eede62b9fe9c8fa0ad9f2c8b..bf259bbd1d0a289bbde53868eda758af1abdb499 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -146,6 +146,7 @@ sdi0_per1@80126000 {
                vmmci: regulator-gpio {
                        gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
                        enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
                };
 
                pinctrl {

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 386eee6de2320aa60365095d74378ce11a865f0d..7900e5d6aa05bcf584dc2a13e590cf999017d44f 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -216,11 +216,15 @@ ethernet@0 {
                        };
                };
 
+               /* ST6G3244ME level translator for 1.8/2.9 V */
                vmmci: regulator-gpio {
                        compatible = "regulator-gpio";
 
+                       /* GPIO228 SD_SEL */
                        gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+                       /* GPIO217 MMC_EN */
                        enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
 
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <2900000>;
@@ -228,7 +232,6 @@ vmmci: regulator-gpio {
                        regulator-type = "voltage";
 
                        startup-delay-us = <100>;
-                       enable-active-high;
 
                        states = <1800000 0x1
                                  2900000 0x0>;
@@ -546,6 +549,7 @@ sdi0 {
                                sdi0_default_mode: sdi0_default {
                                        snowball_mux {
                                                function = "mc0";
+                                               /* Add the DAT31 pin even if it is not really used */
                                                groups = "mc0dat31dir_a_1";
                                        };
                                        snowball_cfg1 {