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

ARM: Kirkwood: Convert DNSKW to use gpio-poweroff.

Browse Source 
Also enable the gpio-poweroff driver when DT is used.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Andrew Lunn 2012-11-17 09:51:05 +01:00 committed by Jason Cooper
parent 96ff0f5c7e
commit 2c0e7ee61b
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View File

@ -35,6 +35,11 @@
6000 2>; 6000 2>;
}; };
gpio_poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio1 4 0>;
};
ocp@f1000000 { ocp@f1000000 {
sata@80000 { sata@80000 {
status = "okay"; status = "okay";

3
arch/arm/mach-kirkwood/Kconfig
View File

@ -46,6 +46,9 @@ config MACH_GURUPLUG
config ARCH_KIRKWOOD_DT config ARCH_KIRKWOOD_DT
bool "Marvell Kirkwood Flattened Device Tree" bool "Marvell Kirkwood Flattened Device Tree"
select POWER_SUPPLY
select POWER_RESET
select POWER_RESET_GPIO
select USE_OF select USE_OF
help help
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the

12
arch/arm/mach-kirkwood/board-dnskw.c
View File

@ -57,11 +57,6 @@ static unsigned int dnskw_mpp_config[] __initdata = {
0 0
}; };
static void dnskw_power_off(void)
{
gpio_set_value(36, 1);
}
/* Register any GPIO for output and set the value */ /* Register any GPIO for output and set the value */
static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) static void __init dnskw_gpio_register(unsigned gpio, char *name, int def)
{ {
@ -80,13 +75,6 @@ void __init dnskw_init(void)
kirkwood_ge00_init(&dnskw_ge00_data); kirkwood_ge00_init(&dnskw_ge00_data);
/* Register power-off GPIO. */
if (gpio_request(36, "dnskw:power:off") == 0
&& gpio_direction_output(36, 0) == 0)
pm_power_off = dnskw_power_off;
else
pr_err("dnskw: failed to configure power-off GPIO\n");
/* Ensure power is supplied to both HDDs */ /* Ensure power is supplied to both HDDs */
dnskw_gpio_register(39, "dnskw:power:sata0", 1); dnskw_gpio_register(39, "dnskw:power:sata0", 1);
dnskw_gpio_register(40, "dnskw:power:sata1", 1); dnskw_gpio_register(40, "dnskw:power:sata1", 1);