summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-12-12 14:31:37 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-12-13 10:27:58 +0100
commita1ab5e4c8073ed5ba76bc08de4bb976a1171a37f (patch)
tree17f463b814ac5250058a6424863eb9e787739694 /arch/arm
parenta987a3accc06b290f49f731260474dfdbf2b6af6 (diff)
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/ste-hrefprev60.dtsi2
-rw-r--r--arch/arm/boot/dts/ste-hrefv60plus.dtsi5
-rw-r--r--arch/arm/boot/dts/ste-snowball.dts6
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index af9914e3b219..40f0ecdf9303 100644
--- 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 1f7b46bb87af..3b6d1181939b 100644
--- 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 9070c3701c89..97d5d21b7db7 100644
--- 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