Skip to contentSkip to conversation

ARM: socfpga: dts: add watchdog0+1

PATCH Superseded Steffen Trumtrar 2 participants 4 messages May 22, 2014 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: socfpga: dts: add watchdog0+1

The SoCFPGA has two watchdog timers. Add them to the dtsi.

---
 arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/socfpga.dtsi +16 -0
index 56fc214..7bcd458 100644
@@ -549,6 +549,22 @@
 			reg = <0xffd05000 0x1000>;
 		};
 
+		watchdog0: watchdog at ffd02000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd02000 0x1000>;
+			interrupts = <0 171 0>;
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
+		watchdog1: watchdog at ffd03000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd03000 0x1000>;
+			interrupts = <0 172 0>;
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
 		sysmgr: sysmgr at ffd08000 {
 			compatible = "altr,sys-mgr", "syscon";
 			reg = <0xffd08000 0x4000>;
Signature · 1 line
2.0.0.rc0
#1 lore raw

PATCH v2 1/1 ARM: socfpga: dts: add watchdog0+1

Hi Steffen,

Quoted 12 lines · Steffen Trumtrar

The SoCFPGA has two watchdog timers. Add them to the dtsi.

---
 arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index 56fc214..7bcd458 100644

arch/arm/boot/dts/socfpga.dtsi line 555

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
@@ -549,6 +549,22 @@
 			reg = <0xffd05000 0x1000>;
 		};
 
+		watchdog0: watchdog at ffd02000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd02000 0x1000>;
+			interrupts = <0 171 0>;

This should be IRQ_TYPE_LEVEL_HIGH.

arch/arm/boot/dts/socfpga.dtsi line 563

Quoted 8 lines
arch/arm/boot/dts/socfpga.dtsi +8 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
+		watchdog1: watchdog at ffd03000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd03000 0x1000>;
+			interrupts = <0 172 0>;

Same here..

arch/arm/boot/dts/socfpga.dtsi line 570

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
 		sysmgr: sysmgr at ffd08000 {
 			compatible = "altr,sys-mgr", "syscon";
 			reg = <0xffd08000 0x4000>;

No need to resend a patch, I'll apply with those changes.

Dinh

#2 lore raw

PATCH v2 1/1 ARM: socfpga: dts: add watchdog0+1

Hi Dinh!

Quoted 32 lines · Dinh Nguyen

Hi Steffen,

Quoted 12 lines · Steffen Trumtrar

The SoCFPGA has two watchdog timers. Add them to the dtsi.

---
 arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index 56fc214..7bcd458 100644

arch/arm/boot/dts/socfpga.dtsi line 555

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
@@ -549,6 +549,22 @@
 			reg = <0xffd05000 0x1000>;
 		};
 
+		watchdog0: watchdog at ffd02000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd02000 0x1000>;
+			interrupts = <0 171 0>;

This should be IRQ_TYPE_LEVEL_HIGH.

arch/arm/boot/dts/socfpga.dtsi line 563

Quoted 8 lines
arch/arm/boot/dts/socfpga.dtsi +8 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
+		watchdog1: watchdog at ffd03000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd03000 0x1000>;
+			interrupts = <0 172 0>;

Same here..

Quoted 7 lines

arch/arm/boot/dts/socfpga.dtsi line 570

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
 		sysmgr: sysmgr at ffd08000 {
 			compatible = "altr,sys-mgr", "syscon";
 			reg = <0xffd08000 0x4000>;

I wasn't aware that we started using the IRQ defines, but...

Quoted 2 lines

No need to resend a patch, I'll apply with those changes.

...great. Thanks.

Steffen

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#3 lore raw

PATCH v2 1/1 ARM: socfpga: dts: add watchdog0+1

Quoted 35 lines · Steffen Trumtrar

Hi Dinh!

Quoted 32 lines · Dinh Nguyen

Hi Steffen,

Quoted 12 lines · Steffen Trumtrar

The SoCFPGA has two watchdog timers. Add them to the dtsi.

---
 arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index 56fc214..7bcd458 100644

arch/arm/boot/dts/socfpga.dtsi line 555

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
@@ -549,6 +549,22 @@
 			reg = <0xffd05000 0x1000>;
 		};
 
+		watchdog0: watchdog at ffd02000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd02000 0x1000>;
+			interrupts = <0 171 0>;

This should be IRQ_TYPE_LEVEL_HIGH.

arch/arm/boot/dts/socfpga.dtsi line 563

Quoted 8 lines
arch/arm/boot/dts/socfpga.dtsi +8 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
+		watchdog1: watchdog at ffd03000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd03000 0x1000>;
+			interrupts = <0 172 0>;

Same here..

Quoted 8 lines
Quoted 7 lines

arch/arm/boot/dts/socfpga.dtsi line 570

Quoted 7 lines
arch/arm/boot/dts/socfpga.dtsi +4 -0
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
 		sysmgr: sysmgr at ffd08000 {
 			compatible = "altr,sys-mgr", "syscon";
 			reg = <0xffd08000 0x4000>;

I wasn't aware that we started using the IRQ defines, but...

You added the support to be able to do that ;). But what I really meant was you had the IRQ type set to 0(IRQ_TYPE_NONE), but it should be 4.

Dinh

Quoted 7 lines
Quoted 3 lines

No need to resend a patch, I'll apply with those changes.

...great. Thanks.

Steffen