diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-11-17 09:46:12 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-23 21:57:02 -0500 |
commit | c3ff813ac9d72f588166b8e802f31f85e8cf731b (patch) | |
tree | e736a6c255129909b5c4e3e5ab44beab4776a0ac /arch/arm/mach-kirkwood | |
parent | 5c2734a30c0838c9ba9b6b95fb18533cea3c1a5a (diff) |
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>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/board-dockstar.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/board-dockstar.c b/arch/arm/mach-kirkwood/board-dockstar.c index e94782d6a266..410452acf323 100644 --- a/arch/arm/mach-kirkwood/board-dockstar.c +++ b/arch/arm/mach-kirkwood/board-dockstar.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/of_fdt.h> | 24 | #include <linux/of_fdt.h> |
25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
26 | #include <linux/of_platform.h> | 26 | #include <linux/of_platform.h> |
27 | #include <linux/gpio.h> | ||
28 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 28 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
@@ -52,9 +51,5 @@ void __init dockstar_dt_init(void) | |||
52 | */ | 51 | */ |
53 | kirkwood_mpp_conf(dockstar_mpp_config); | 52 | kirkwood_mpp_conf(dockstar_mpp_config); |
54 | 53 | ||
55 | if (gpio_request(29, "USB Power Enable") != 0 || | ||
56 | gpio_direction_output(29, 1) != 0) | ||
57 | pr_err("can't setup GPIO 29 (USB Power Enable)\n"); | ||
58 | |||
59 | kirkwood_ge00_init(&dockstar_ge00_data); | 54 | kirkwood_ge00_init(&dockstar_ge00_data); |
60 | } | 55 | } |