| Message ID | 1371545519-27119-3-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tuesday 18 June 2013, Lee Jones wrote: > - 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>; Is it intentional that you had "gpios" before and "gpio" after the change as the property name? Arnd
On Tue, 18 Jun 2013, Arnd Bergmann wrote: > On Tuesday 18 June 2013, Lee Jones wrote: > > - 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>; > > Is it intentional that you had "gpios" before and "gpio" after the change > as the property name? Yes, it's intentional. See: drivers/regulator/fixed.c
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index fb9dce5..49824be 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 {
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> --- arch/arm/boot/dts/snowball.dts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)