From f823c3c2a89d7cb8e16361127a440b9505252bed Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 17 Nov 2012 09:51:06 +0100
Subject: [PATCH] --- yaml --- r: 342334 b: refs/heads/master c:
 2104035214b51d007db7e040906550eb608aaa44 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts |  6 ++++++
 trunk/arch/arm/mach-kirkwood/board-ib62x0.c | 13 -------------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 80c167ee916d..6a3d4b27a570 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c0e7ee61b335dea4bd2678591923c02703f4eeb
+refs/heads/master: 2104035214b51d007db7e040906550eb608aaa44
diff --git a/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts b/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 66794ed75ff1..6a9558d24da2 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/trunk/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/trunk/arch/arm/mach-kirkwood/board-ib62x0.c b/trunk/arch/arm/mach-kirkwood/board-ib62x0.c
index db08e379a40a..2a58b4fc453b 100644
--- a/trunk/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/trunk/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");
 }