leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: Kirkwood: Convert LSXL to use regulators

Browse Source 
Control the power to USB and HDD using a fixed regulator.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Andrew Lunn 2012-11-17 15:46:14 +01:00 committed by Jason Cooper
parent 280b348d91
commit 423b89595d
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View File

@ -105,4 +105,33 @@
5000 0>; 5000 0>;
alarm-gpios = <&gpio1 8 0>; alarm-gpios = <&gpio1 8 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 11 0>;
};
hdd_power: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "HDD Power";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 10 0>;
};
};
}; };

8
arch/arm/mach-kirkwood/board-lsxl.c
View File

@ -19,7 +19,6 @@
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
@ -61,9 +60,6 @@ static void lsxl_power_off(void)
kirkwood_restart('h', NULL); kirkwood_restart('h', NULL);
} }
#define LSXL_GPIO_HDD_POWER 10
#define LSXL_GPIO_USB_POWER 11
void __init lsxl_init(void) void __init lsxl_init(void)
{ {
/* /*
@ -71,10 +67,6 @@ void __init lsxl_init(void)
*/ */
kirkwood_mpp_conf(lsxl_mpp_config); kirkwood_mpp_conf(lsxl_mpp_config);
/* usb and sata power on */
gpio_set_value(LSXL_GPIO_USB_POWER, 1);
gpio_set_value(LSXL_GPIO_HDD_POWER, 1);
kirkwood_ge00_init(&lsxl_ge00_data); kirkwood_ge00_init(&lsxl_ge00_data);
kirkwood_ge01_init(&lsxl_ge01_data); kirkwood_ge01_init(&lsxl_ge01_data);