summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/snowball.dts
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-06-18 09:51:58 +0100
committerArnd Bergmann <arnd@arndb.de>2013-06-21 14:48:32 +0200
commitb099576de9d7352a1f4b7650eef562f3d4d29198 (patch)
treee4fb768306639532ab594782a7c4805c00eed3f8 /arch/arm/boot/dts/snowball.dts
parent348f3bc6e92e95aa153e9dc413755aaee892b139 (diff)
downloadblackbird-op-linux-b099576de9d7352a1f4b7650eef562f3d4d29198.tar.gz
blackbird-op-linux-b099576de9d7352a1f4b7650eef562f3d4d29198.zip
ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO
When this node was added, the AB8500 GPIO driver was pretty broken. As a hack, we pretended that NOMADIK GPIO 26 was the correct on/off pin, as it was unused. It worked because AB8500 GPIO 26 was in an 'always on from boot' state. Now the AB8500 GPIO driver is working, the default state for all the pins is 'off'. Let's flip back over to use the correct GPIO which is _actually_ attached to the regulator. We're also taking the opportunity to straighten out some formatting misdemeanours, swapping spaces for tabs. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/snowball.dts')
-rw-r--r--arch/arm/boot/dts/snowball.dts13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index db5db24fd544..da3f02a7d84b 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -22,12 +22,13 @@
en_3v3_reg: en_3v3 {
compatible = "regulator-fixed";
- regulator-name = "en-3v3-fixed-supply";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- gpios = <&gpio0 26 0x4>; // 26
- startup-delay-us = <5000>;
- enable-active-high;
+ regulator-name = "en-3v3-fixed-supply";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */
+ gpio = <&ab8500_gpio 25 0x4>;
+ startup-delay-us = <5000>;
+ enable-active-high;
};
gpio_keys {
OpenPOWER on IntegriCloud