public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: sun9i: Add device node for watchdog
@ 2015-05-26 16:54 Chen-Yu Tsai
  2015-05-27 14:36 ` Maxime Ripard
  0 siblings, 1 reply; 2+ messages in thread
From: Chen-Yu Tsai @ 2015-05-26 16:54 UTC (permalink / raw)
  To: linux-arm-kernel

On A80 there are 2 watchdogs, one in the main block, and one in the
R (special) block. We do not have information on the R block watchdog,
other than the register layout is the same, and the interrupt number.
Both are able to reset the whole system.

Add the main watchdog, in case the R block is used for special purposes
like running an RTOS.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun9i-a80.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index ca272e92b85d..a43ad779ee2f 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -565,6 +565,12 @@
 			clocks = <&osc24M>;
 		};
 
+		wdt: watchdog at 06000ca0 {
+			compatible = "allwinner,sun6i-a31-wdt";
+			reg = <0x06000ca0 0x20>;
+			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
 		pio: pinctrl at 06000800 {
 			compatible = "allwinner,sun9i-a80-pinctrl";
 			reg = <0x06000800 0x400>;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [PATCH] ARM: dts: sun9i: Add device node for watchdog
  2015-05-26 16:54 [PATCH] ARM: dts: sun9i: Add device node for watchdog Chen-Yu Tsai
@ 2015-05-27 14:36 ` Maxime Ripard
  0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2015-05-27 14:36 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, May 27, 2015 at 12:54:16AM +0800, Chen-Yu Tsai wrote:
> On A80 there are 2 watchdogs, one in the main block, and one in the
> R (special) block. We do not have information on the R block watchdog,
> other than the register layout is the same, and the interrupt number.
> Both are able to reset the whole system.
> 
> Add the main watchdog, in case the R block is used for special purposes
> like running an RTOS.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

Applied, thanks!

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150527/1cb78a55/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-05-27 14:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-26 16:54 [PATCH] ARM: dts: sun9i: Add device node for watchdog Chen-Yu Tsai
2015-05-27 14:36 ` Maxime Ripard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox