diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-12-28 13:25:10 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-26 01:12:02 +0000 |
| commit | 4350a47bbac3f90c724d565d7b895262f454d0c3 (patch) | |
| tree | f38246acfd6410dd242b9f628bf20bce258ee6bf /arch/arm | |
| parent | 193da78bec1b510ab0a743348a7e9a2c24766268 (diff) | |
ARM: Kirkwood: Make use of the QNAP Power off driver.
Add a node into the DT binding and remove C code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-ts219.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi index 64ea27cb3298..4e29460baf04 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -31,6 +31,11 @@ clock-frequency = <200000000>; status = "okay"; }; + poweroff@12100 { + compatible = "qnap,power-off"; + reg = <0x12000 0x100>; + clocks = <&gate_clk 7>; + }; spi@10600 { status = "okay"; diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 58518a2a68f9..e12376b60b1b 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -315,6 +315,7 @@ config MACH_TS219_DT select ARCH_KIRKWOOD_DT select ARM_APPENDED_DTB select ARM_ATAG_DTB_COMPAT + select POWER_RESET_QNAP help Say 'Y' here if you want your kernel to support the QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c index acb0187c7ee1..10fb3974de5a 100644 --- a/arch/arm/mach-kirkwood/board-ts219.c +++ b/arch/arm/mach-kirkwood/board-ts219.c @@ -23,7 +23,6 @@ #include <asm/mach/arch.h> #include <mach/kirkwood.h> #include "common.h" -#include "tsx1x-common.h" static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), @@ -38,8 +37,6 @@ void __init qnap_dt_ts219_init(void) qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); kirkwood_ge00_init(&qnap_ts219_ge00_data); - - pm_power_off = qnap_tsx1x_power_off; } /* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */ |