diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-11-17 15:46:13 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 02:57:06 +0000 |
| commit | 280b348d9157b77cceb1aafd6b0e9ac6eb6c3b44 (patch) | |
| tree | 4aa389a82c701cae92940aa0d5cfd7071fa1f1a6 | |
| parent | c3ff813ac9d72f588166b8e802f31f85e8cf731b (diff) | |
ARM: Kirkwood: Convert GoFlexNet to use regulators
Control the power to USB using a fixed regulator.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Josh Coombs <josh.coombs@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-goflexnet.dts | 17 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-goflexnet.c | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index 7c8238fbb6f9..84de887620ec 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts @@ -96,4 +96,21 @@ gpios = <&gpio1 9 0>; }; }; + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usb_power: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 29 0>; + }; + }; }; diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c index d388bea71360..5ff439231567 100644 --- a/arch/arm/mach-kirkwood/board-goflexnet.c +++ b/arch/arm/mach-kirkwood/board-goflexnet.c @@ -26,7 +26,6 @@ #include <linux/of_fdt.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -#include <linux/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -62,9 +61,5 @@ void __init goflexnet_init(void) */ kirkwood_mpp_conf(goflexnet_mpp_config); - if (gpio_request(29, "USB Power Enable") != 0 || - gpio_direction_output(29, 1) != 0) - pr_err("can't setup GPIO 29 (USB Power Enable)\n"); - kirkwood_ge00_init(&goflexnet_ge00_data); } |