diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-12-28 13:25:12 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-26 03:12:34 +0200 |
| commit | 391a16c7783a64309dc930c6d454372d7a8beb12 (patch) | |
| tree | 544ab00836f330ee774b33bec05d78e15c381f7f /arch/arm/mach-kirkwood | |
| parent | ARM: Kirkwood: Make use of the QNAP Power off driver. (diff) | |
| download | linux-391a16c7783a64309dc930c6d454372d7a8beb12.tar.xz linux-391a16c7783a64309dc930c6d454372d7a8beb12.zip | |
ARM: Kirkwood: Convert LSXL to restart-poweroff driver.
Add a device tree node and remove the C code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-lsxl.c | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index e12376b60b1b..1f7078e453b0 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -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 diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c index 4ec8b7ae784a..348395238df6 100644 --- a/arch/arm/mach-kirkwood/board-lsxl.c +++ b/arch/arm/mach-kirkwood/board-lsxl.c @@ -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; } |