linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] ARM: Kirkwood: Make use of the QNAP Power off driver.
Date: Fri, 28 Dec 2012 13:25:10 +0100	[thread overview]
Message-ID: <1356697512-3950-3-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1356697512-3950-1-git-send-email-andrew@lunn.ch>

Add a node into the DT binding and remove C code.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/boot/dts/kirkwood-ts219.dtsi |    5 +++++
 arch/arm/mach-kirkwood/Kconfig        |    1 +
 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 64ea27c..4e29460 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 at 12100 {
+			compatible = "qnap,power-off";
+			reg = <0x12000 0x100>;
+			clocks = <&gate_clk 7>;
+		};
 		spi at 10600 {
 			status = "okay";
 
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index f91cdff..bb4de9c 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -92,6 +92,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 acb0187..10fb397 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? */
-- 
1.7.10.4

  parent reply	other threads:[~2012-12-28 12:25 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-28 12:25 [PATCH 0/4] Power off drivers for QNAP and LSXL Andrew Lunn
2012-12-28 12:25 ` [PATCH 1/4] Power: Reset: Driver to turn QNAP board power off Andrew Lunn
2013-01-06 21:55   ` Anton Vorontsov
2013-01-08 18:15     ` [PATCH] power: reset: qnap-poweroff: Fix License String Andrew Lunn
2013-01-20  2:05       ` Anton Vorontsov
2013-01-20 20:13       ` Uwe Kleine-König
2013-01-20 20:47         ` Anton Vorontsov
2013-01-21  8:11           ` Uwe Kleine-König
2012-12-28 12:25 ` Andrew Lunn [this message]
2012-12-28 12:25 ` [PATCH 3/4] Power: Reset: Power off by restarting Andrew Lunn
2012-12-28 18:59   ` Michael Walle
2013-01-06 22:04     ` Anton Vorontsov
2013-01-07  6:42       ` Andrew Lunn
2013-01-07  7:00         ` Anton Vorontsov
2013-01-07 11:27       ` Jason Cooper
2013-01-31 18:54       ` [PATCH] power/reset: restart: remove __dev{init,exit} Jason Cooper
2013-01-31 18:57         ` Jason Cooper
2013-01-31 20:02         ` Andrew Lunn
2013-01-31 20:20           ` Jason Cooper
2013-02-03  3:43             ` Anton Vorontsov
2012-12-28 12:25 ` [PATCH 4/4] ARM: Kirkwood: Convert LSXL to restart-poweroff driver Andrew Lunn
2012-12-28 19:16   ` Michael Walle
2012-12-28 19:39     ` Andrew Lunn
2012-12-28 23:11       ` Michael Walle
2013-01-23 12:53 ` [PATCH 0/4] Power off drivers for QNAP and LSXL Jason Cooper
2013-05-26  1:19   ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1356697512-3950-3-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).