Skip to content

Commit

Permalink
ARM: Kirkwood: Convert NS2 to gpio-poweroff.
Browse files Browse the repository at this point in the history
Remove C code and add a Device Tree node in its place.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Andrew Lunn authored and Arnd Bergmann committed Feb 28, 2013
1 parent b4d2a24 commit 102c954
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/kirkwood-ns2-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,10 @@
gpios = <&gpio0 12 0>;
};
};

gpio_poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio0 31 0>;
};

};
14 changes: 0 additions & 14 deletions arch/arm/mach-kirkwood/board-ns2.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,13 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/mv643xx_eth.h>
#include <linux/gpio.h>
#include <linux/of.h>
#include "common.h"

static struct mv643xx_eth_platform_data ns2_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
};

#define NS2_GPIO_POWER_OFF 31

static void ns2_power_off(void)
{
gpio_set_value(NS2_GPIO_POWER_OFF, 1);
}

void __init ns2_init(void)
{
/*
Expand All @@ -39,10 +31,4 @@ void __init ns2_init(void)
of_machine_is_compatible("lacie,netspace_mini_v2"))
ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
kirkwood_ge00_init(&ns2_ge00_data);

if (gpio_request(NS2_GPIO_POWER_OFF, "power-off") == 0 &&
gpio_direction_output(NS2_GPIO_POWER_OFF, 0) == 0)
pm_power_off = ns2_power_off;
else
pr_err("ns2: failed to configure power-off GPIO\n");
}

0 comments on commit 102c954

Please sign in to comment.