]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO
authorLee Jones <lee.jones@linaro.org>
Tue, 18 Jun 2013 08:51:58 +0000 (09:51 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 12:48:32 +0000 (14:48 +0200)
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>
arch/arm/boot/dts/snowball.dts

index db5db24fd54407233b42aa1cc4b202e589eabdd0..da3f02a7d84bcb3586cead151fe5d12b278d893e 100644 (file)
 
        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 {