diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-11-17 03:51:06 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-23 21:56:49 -0500 |
commit | 2104035214b51d007db7e040906550eb608aaa44 (patch) | |
tree | edd251a74ad888986ad5b9cd509895c65a6a053a /arch/arm/mach-kirkwood/board-ib62x0.c | |
parent | 2c0e7ee61b335dea4bd2678591923c02703f4eeb (diff) |
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>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-ib62x0.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-ib62x0.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c index db08e379a40a..2a58b4fc453b 100644 --- a/arch/arm/mach-kirkwood/board-ib62x0.c +++ b/arch/arm/mach-kirkwood/board-ib62x0.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/mtd/partitions.h> | 17 | #include <linux/mtd/partitions.h> |
18 | #include <linux/ata_platform.h> | 18 | #include <linux/ata_platform.h> |
19 | #include <linux/mv643xx_eth.h> | 19 | #include <linux/mv643xx_eth.h> |
20 | #include <linux/gpio.h> | ||
21 | #include <linux/input.h> | 20 | #include <linux/input.h> |
22 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
23 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
@@ -25,8 +24,6 @@ | |||
25 | #include "common.h" | 24 | #include "common.h" |
26 | #include "mpp.h" | 25 | #include "mpp.h" |
27 | 26 | ||
28 | #define IB62X0_GPIO_POWER_OFF 24 | ||
29 | |||
30 | static struct mv643xx_eth_platform_data ib62x0_ge00_data = { | 27 | static struct mv643xx_eth_platform_data ib62x0_ge00_data = { |
31 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | 28 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
32 | }; | 29 | }; |
@@ -49,11 +46,6 @@ static unsigned int ib62x0_mpp_config[] __initdata = { | |||
49 | 0 | 46 | 0 |
50 | }; | 47 | }; |
51 | 48 | ||
52 | static void ib62x0_power_off(void) | ||
53 | { | ||
54 | gpio_set_value(IB62X0_GPIO_POWER_OFF, 1); | ||
55 | } | ||
56 | |||
57 | void __init ib62x0_init(void) | 49 | void __init ib62x0_init(void) |
58 | { | 50 | { |
59 | /* | 51 | /* |
@@ -62,9 +54,4 @@ void __init ib62x0_init(void) | |||
62 | kirkwood_mpp_conf(ib62x0_mpp_config); | 54 | kirkwood_mpp_conf(ib62x0_mpp_config); |
63 | 55 | ||
64 | kirkwood_ge00_init(&ib62x0_ge00_data); | 56 | kirkwood_ge00_init(&ib62x0_ge00_data); |
65 | if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 && | ||
66 | gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0) | ||
67 | pm_power_off = ib62x0_power_off; | ||
68 | else | ||
69 | pr_err("board-ib62x0: failed to configure power-off GPIO\n"); | ||
70 | } | 57 | } |