summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/ste-snowball.dts
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2015-04-20 16:02:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-17 09:53:50 -0700
commit55687fa5a1c39c8ea66b8830a25d53258ce3ba26 (patch)
tree8bce205236b1a836ca9d0fccefc4d95700b72ff7 /arch/arm/boot/dts/ste-snowball.dts
parent2a505881f33bc692528b9bd194dd3f77d55ceb27 (diff)
ARM: ux500: Move GPIO regulator for SD-card into board DTSs
commit 53d2669844263fd5fdc70f0eb6a2eb8a21086d8e upstream. The GPIO regulator for the SD-card isn't a ux500 SOC configuration, but instead it's specific to the board. Move the definition of it, into the board DTSs. Fixes: c94a4ab7af3f ("ARM: ux500: Disable the MMCI gpio-regulator by default") Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-snowball.dts')
-rw-r--r--arch/arm/boot/dts/ste-snowball.dts15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 97d5d21b7db7..8bac2506cb78 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -146,8 +146,23 @@
};
vmmci: regulator-gpio {
+ compatible = "regulator-gpio";
+
gpios = <&gpio7 4 0x4>;
enable-gpio = <&gpio6 25 0x4>;
+
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <2900000>;
+ regulator-name = "mmci-reg";
+ regulator-type = "voltage";
+
+ startup-delay-us = <100>;
+ enable-active-high;
+
+ states = <1800000 0x1
+ 2900000 0x0>;
+
+ status = "disabled";
};
// External Micro SD slot