Commit 2141102e authored by Michel Marti's avatar Michel Marti Committed by Nicolas Ferre

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

Since turning on idle-halt in commit fe46aa67 (ARM: at91/dt: add
sam9 watchdog default options to SoCs), SoCs compatible with at91sam9260-wdt
no longer reboot if the watchdog times out while the CPU is in idle state.
Removing the 'idle-halt' flag that was set by default fixes this.
Signed-off-by: default avatarMichel Marti <mma@objectxp.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
[nicolas.ferre@atmel.com: rework the commit message]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 56608400
...@@ -976,7 +976,6 @@ watchdog@fffffd40 { ...@@ -976,7 +976,6 @@ watchdog@fffffd40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
...@@ -905,7 +905,6 @@ watchdog@fffffd40 { ...@@ -905,7 +905,6 @@ watchdog@fffffd40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
...@@ -1116,7 +1116,6 @@ watchdog@fffffd40 { ...@@ -1116,7 +1116,6 @@ watchdog@fffffd40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
...@@ -894,7 +894,6 @@ watchdog@fffffe40 { ...@@ -894,7 +894,6 @@ watchdog@fffffe40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
...@@ -1130,7 +1130,6 @@ watchdog@fffffe40 { ...@@ -1130,7 +1130,6 @@ watchdog@fffffe40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
...@@ -1248,7 +1248,6 @@ watchdog@fffffe40 { ...@@ -1248,7 +1248,6 @@ watchdog@fffffe40 {
atmel,watchdog-type = "hardware"; atmel,watchdog-type = "hardware";
atmel,reset-type = "all"; atmel,reset-type = "all";
atmel,dbg-halt; atmel,dbg-halt;
atmel,idle-halt;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment