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

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 66794ed75ff1d3162dc8a567b7f36b37c020b1f2..6a9558d24da28a74dbf122f49d5c2b9f281bad84 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -79,4 +79,10 @@
                        gpios = <&gpio0 27 0>;
                };
        };
+       gpio_poweroff {
+               compatible = "gpio-poweroff";
+               gpios = <&gpio0 24 0>;
+       };
+
+
 };

diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
index db08e379a40a99caf4934148b656928f3828e88c..2a58b4fc453b2abbb264c32ffd0fbb783a2463e0 100644 (file)
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@ -17,7 +17,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
 #include <linux/input.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -25,8 +24,6 @@
 #include "common.h"
 #include "mpp.h"
 
-#define IB62X0_GPIO_POWER_OFF  24
-
 static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
 };
@@ -49,11 +46,6 @@ static unsigned int ib62x0_mpp_config[] __initdata = {
        0
 };
 
-static void ib62x0_power_off(void)
-{
-       gpio_set_value(IB62X0_GPIO_POWER_OFF, 1);
-}
-
 void __init ib62x0_init(void)
 {
        /*
@@ -62,9 +54,4 @@ void __init ib62x0_init(void)
        kirkwood_mpp_conf(ib62x0_mpp_config);
 
        kirkwood_ge00_init(&ib62x0_ge00_data);
-       if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&
-           gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0)
-               pm_power_off = ib62x0_power_off;
-       else
-               pr_err("board-ib62x0: failed to configure power-off GPIO\n");
 }