diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-11-17 14:46:12 (GMT) |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-24 02:57:02 (GMT) |
| commit | c3ff813ac9d72f588166b8e802f31f85e8cf731b (patch) | |
| tree | e736a6c255129909b5c4e3e5ab44beab4776a0ac | |
| parent | 5c2734a30c0838c9ba9b6b95fb18533cea3c1a5a (diff) | |
| download | linux-c3ff813ac9d72f588166b8e802f31f85e8cf731b.tar.xz | |
ARM: Kirkwood: Convert Dockstar to use regulators
Control the power to USB using a fixed regulator.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-dockstar.dts | 17 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dockstar.c | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts index 08a5824..c0fbfdc 100644 --- a/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/arch/arm/boot/dts/kirkwood-dockstar.dts @@ -54,4 +54,21 @@ gpios = <&gpio1 15 1>; }; }; + 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-dockstar.c b/arch/arm/mach-kirkwood/board-dockstar.c index e94782d..410452a 100644 --- a/arch/arm/mach-kirkwood/board-dockstar.c +++ b/arch/arm/mach-kirkwood/board-dockstar.c @@ -24,7 +24,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> @@ -52,9 +51,5 @@ void __init dockstar_dt_init(void) */ kirkwood_mpp_conf(dockstar_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(&dockstar_ge00_data); } |