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>

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 37d45c4f88fbf3bd5db139c43b0f7588aeb70d09..996c7fefd253956c03d1a70a12f7be2db90dfa8f 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -172,6 +172,10 @@
                alarm-gpios = <&gpio1 8 0>;
        };
 
+       restart_poweroff {
+               compatible = "restart-poweroff";
+       };
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index e12376b60b1b6951cbcc9b2e2ef1f02ee592466c..1f7078e453b0209936c722edfcfca9ea3c406f35 100644 (file)
--- 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 4ec8b7ae784a298af778cd191b25b671d810c39c..348395238df6da58b4ebae42d3494a544c75969a 100644 (file)
--- 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;
 }