Skip to contentSkip to conversation

ARM: at91/dt: keep watchdog running in idle mode

PATCH New Michel Marti 4 participants 4 messages Dec 23, 2014 – Mar 4, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: at91/dt: keep watchdog running in idle mode

Since turning on idle-halt in commit fe46aa679, SoCs compatible with the sam9 watchdog no longer reboot if the wdt times out. Removing the 'idle-halt' flag fixes this.

---
 arch/arm/boot/dts/at91sam9260.dtsi | 1 -
 arch/arm/boot/dts/at91sam9263.dtsi | 1 -
 arch/arm/boot/dts/at91sam9g45.dtsi | 1 -
 arch/arm/boot/dts/at91sam9n12.dtsi | 1 -
 arch/arm/boot/dts/at91sam9x5.dtsi  | 1 -
 arch/arm/boot/dts/sama5d3.dtsi     | 1 -
 6 files changed, 6 deletions(-)
arch/arm/boot/dts/at91sam9260.dtsi +0 -1
index dd1313c..184e1d1 100644
@@ -971,7 +971,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9263.dtsi +0 -1
index 1467750..c39556b 100644
@@ -874,7 +874,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9g45.dtsi +0 -1
index 2a8da8a..b8d741d 100644
@@ -1111,7 +1111,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9n12.dtsi +0 -1
index 68eb9ad..e0b5c24 100644
@@ -889,7 +889,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9x5.dtsi +0 -1
index bbb3ba6..ce61f91 100644
@@ -1125,7 +1125,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/sama5d3.dtsi +0 -1
index 5f4144d..63d12ed 100644
@@ -1224,7 +1224,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: at91/dt: keep watchdog running in idle mode

Quoted 5 lines · On Tue, 23 Dec 2014 12:41:43 +0100 Michel Marti <[email protected]> wrote:

Since turning on idle-halt in commit fe46aa679, SoCs compatible with the sam9 watchdog no longer reboot if the wdt times out. Removing the 'idle-halt' flag fixes this.

Quoted 81 lines
---
 arch/arm/boot/dts/at91sam9260.dtsi | 1 -
 arch/arm/boot/dts/at91sam9263.dtsi | 1 -
 arch/arm/boot/dts/at91sam9g45.dtsi | 1 -
 arch/arm/boot/dts/at91sam9n12.dtsi | 1 -
 arch/arm/boot/dts/at91sam9x5.dtsi  | 1 -
 arch/arm/boot/dts/sama5d3.dtsi     | 1 -
 6 files changed, 6 deletions(-)
arch/arm/boot/dts/at91sam9260.dtsi +0 -1
index dd1313c..184e1d1 100644
@@ -971,7 +971,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9263.dtsi +0 -1
index 1467750..c39556b 100644
@@ -874,7 +874,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9g45.dtsi +0 -1
index 2a8da8a..b8d741d 100644
@@ -1111,7 +1111,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9n12.dtsi +0 -1
index 68eb9ad..e0b5c24 100644
@@ -889,7 +889,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/at91sam9x5.dtsi +0 -1
index bbb3ba6..ce61f91 100644
@@ -1125,7 +1125,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
arch/arm/boot/dts/sama5d3.dtsi +0 -1
index 5f4144d..63d12ed 100644
@@ -1224,7 +1224,6 @@
                 atmel,watchdog-type = "hardware";
                 atmel,reset-type = "all";
                 atmel,dbg-halt;
-                atmel,idle-halt;
                 status = "disabled";
             };
 
Signature · 3 lines
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 ARM: at91/dt: keep watchdog running in idle mode

In reply to Michel Marti

Hello Nicolas, Michel,

Quoted 3 lines · Michel Marti

Since turning on idle-halt in commit fe46aa679, SoCs compatible with the sam9 watchdog no longer reboot if the wdt times out. Removing the 'idle-halt' flag fixes this.

I missed that and I did exactly the same recently in my "[PATCHv2 0/2]
dts: AT91 Watchdog, remove property idle halt by default", first come, first serve:

But my patch summary is IMHO better (even with my broken english ;-).

Sylvain

#3 lore raw

PATCH 1/1 ARM: at91/dt: keep watchdog running in idle mode

Le 04/03/2015 11:18, Sylvain Rochet a ?crit :

Quoted 7 lines

Hello Nicolas, Michel,

Quoted 3 lines · Michel Marti

Since turning on idle-halt in commit fe46aa679, SoCs compatible with the sam9 watchdog no longer reboot if the wdt times out. Removing the 'idle-halt' flag fixes this.

Quoted 7 lines

I missed that and I did exactly the same recently in my "[PATCHv2 0/2]
dts: AT91 Watchdog, remove property idle halt by default", first come, first serve:

But my patch summary is IMHO better (even with my broken english ;-).

I try to take it for at91-4.0-at91 and mix the 2 commit messages.
+ I take your documentation of the DT property.

Thanks, bye,

Signature · 1 line
Nicolas Ferre