diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-12-28 15:08:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:57:12 +0100 |
| commit | 12131b5424577b2eb1bef5a41220d310594e42dc (patch) | |
| tree | 02c927bfb0496b27ecded8dbe04c64d6438252a1 /arch | |
| parent | ARM: Dove: add fixed regulator for CuBox USB power (diff) | |
| download | linux-12131b5424577b2eb1bef5a41220d310594e42dc.tar.xz linux-12131b5424577b2eb1bef5a41220d310594e42dc.zip | |
ARM: Kirkwood: Convert NSA310 to DT based regulators.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310.dts | 17 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-nsa310.c | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 5509f9659546..2dc1d0929e89 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -141,4 +141,21 @@ gpios = <&gpio1 8 0>; }; }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usb0_power_off: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power Off"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 21 0>; + }; + }; }; diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c index 2fa71400ecb3..891322b44633 100644 --- a/arch/arm/mach-kirkwood/board-nsa310.c +++ b/arch/arm/mach-kirkwood/board-nsa310.c @@ -17,7 +17,6 @@ #include "common.h" #include "mpp.h" -#define NSA310_GPIO_USB_POWER_OFF 21 #define NSA310_GPIO_POWER_OFF 48 static unsigned int nsa310_mpp_config[] __initdata = { @@ -70,9 +69,6 @@ static void __init nsa310_gpio_init(void) "Power Off"); if (!err) pm_power_off = nsa310_power_off; - - nsa310_gpio_request(NSA310_GPIO_USB_POWER_OFF, GPIOF_OUT_INIT_LOW, - "USB Power Off"); } void __init nsa310_init(void) |