aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/at91sam9n12.dtsi
diff options
context:
space:
mode:
authorMichel Marti <mma@objectxp.com>2014-12-23 12:41:43 +0100
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-03-04 11:20:52 +0100
commit2141102e045e622cac176891cb66c5bf08e439f5 (patch)
treee595a3bcd32efb4901d7643e9ea4989242490892 /arch/arm/boot/dts/at91sam9n12.dtsi
parent566084007d3672aebd82a27b448095be67fb208f (diff)
downloadlinux-linaro-stable-2141102e045e622cac176891cb66c5bf08e439f5.tar.gz
ARM: at91/dt: keep watchdog running in idle mode
Since turning on idle-halt in commit fe46aa679f12 (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: Michel Marti <mma@objectxp.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Sylvain Rochet <sylvain.rochet@finsecur.com> [nicolas.ferre@atmel.com: rework the commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9n12.dtsi')
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index c2666a7cb5b1..0c53a375ba99 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -894,7 +894,6 @@
atmel,watchdog-type = "hardware";
atmel,reset-type = "all";
atmel,dbg-halt;
- atmel,idle-halt;
status = "disabled";
};