diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-12-28 07:25:12 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-25 21:12:34 -0400 |
commit | 391a16c7783a64309dc930c6d454372d7a8beb12 (patch) | |
tree | 544ab00836f330ee774b33bec05d78e15c381f7f /arch/arm/mach-kirkwood | |
parent | 4350a47bbac3f90c724d565d7b895262f454d0c3 (diff) |
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 | |||
227 | config MACH_LSXL_DT | 227 | config MACH_LSXL_DT |
228 | bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)" | 228 | bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)" |
229 | select ARCH_KIRKWOOD_DT | 229 | select ARCH_KIRKWOOD_DT |
230 | select POWER_RESET_RESTART | ||
230 | help | 231 | help |
231 | Say 'Y' here if you want your kernel to support the | 232 | Say 'Y' here if you want your kernel to support the |
232 | Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using | 233 | 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 = { | |||
25 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | 25 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
26 | }; | 26 | }; |
27 | 27 | ||
28 | /* | ||
29 | * On the LS-XHL/LS-CHLv2, the shutdown process is following: | ||
30 | * - Userland monitors key events until the power switch goes to off position | ||
31 | * - The board reboots | ||
32 | * - U-boot starts and goes into an idle mode waiting for the user | ||
33 | * to move the switch to ON position | ||
34 | * | ||
35 | */ | ||
36 | static void lsxl_power_off(void) | ||
37 | { | ||
38 | kirkwood_restart('h', NULL); | ||
39 | } | ||
40 | |||
41 | void __init lsxl_init(void) | 28 | void __init lsxl_init(void) |
42 | { | 29 | { |
43 | /* | 30 | /* |
@@ -46,7 +33,4 @@ void __init lsxl_init(void) | |||
46 | 33 | ||
47 | kirkwood_ge00_init(&lsxl_ge00_data); | 34 | kirkwood_ge00_init(&lsxl_ge00_data); |
48 | kirkwood_ge01_init(&lsxl_ge01_data); | 35 | kirkwood_ge01_init(&lsxl_ge01_data); |
49 | |||
50 | /* register power-off method */ | ||
51 | pm_power_off = lsxl_power_off; | ||
52 | } | 36 | } |