Skip to content

Commit

Permalink
ARM: Kirkwood: Convert Dockstar to use regulators
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Lunn authored and Jason Cooper committed Nov 24, 2012
1 parent 5c2734a commit c3ff813
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
17 changes: 17 additions & 0 deletions arch/arm/boot/dts/kirkwood-dockstar.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};
};
5 changes: 0 additions & 5 deletions arch/arm/mach-kirkwood/board-dockstar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
}

0 comments on commit c3ff813

Please sign in to comment.