Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c0e7ee6 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

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



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

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 96ff0f5c

arch/arm/boot/dts/kirkwood-dnskw.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
				      6000 2>;

	};



	gpio_poweroff {

		compatible = "gpio-poweroff";

		gpios = <&gpio1 4 0>;

	};



	ocp@f1000000 {

		sata@80000 {

			status = "okay";

arch/arm/mach-kirkwood/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ config MACH_GURUPLUG 


config ARCH_KIRKWOOD_DT

	bool "Marvell Kirkwood Flattened Device Tree"

	select POWER_SUPPLY

	select POWER_RESET

	select POWER_RESET_GPIO

	select USE_OF

	help

	  Say 'Y' here if you want your kernel to support the

arch/arm/mach-kirkwood/board-dnskw.c

+0 −12
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ static unsigned int dnskw_mpp_config[] __initdata = { 
	0

};



static void dnskw_power_off(void)

{

	gpio_set_value(36, 1);

}



/* Register any GPIO for output and set the value */

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);



	/* 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 */

	dnskw_gpio_register(39, "dnskw:power:sata0", 1);

	dnskw_gpio_register(40, "dnskw:power:sata1", 1);