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

Commit 391a16c7 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: Convert LSXL to restart-poweroff driver. 



Add a device tree node and remove the C code.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 4350a47b

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

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ 
		alarm-gpios = <&gpio1 8 0>;

	};



	restart_poweroff {

		compatible = "restart-poweroff";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

arch/arm/mach-kirkwood/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ config MACH_KM_KIRKWOOD_DT 
config MACH_LSXL_DT

	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	select POWER_RESET_RESTART

	help

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

	  Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using

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

+0 −16
Original line number Diff line number Diff line
@@ -25,19 +25,6 @@ static struct mv643xx_eth_platform_data lsxl_ge01_data = { 
	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),

};



/*

 * On the LS-XHL/LS-CHLv2, the shutdown process is following:

 * - Userland monitors key events until the power switch goes to off position

 * - The board reboots

 * - U-boot starts and goes into an idle mode waiting for the user

 *   to move the switch to ON position

 *

 */

static void lsxl_power_off(void)

{

	kirkwood_restart('h', NULL);

}



void __init lsxl_init(void)

{

	/*
@@ -46,7 +33,4 @@ void __init lsxl_init(void) 


	kirkwood_ge00_init(&lsxl_ge00_data);

	kirkwood_ge01_init(&lsxl_ge01_data);



	/* register power-off method */

	pm_power_off = lsxl_power_off;

}