Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2141102e authored Dec 23, 2014 by Michel Marti Committed by Nicolas Ferre Mar 04, 2015

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: 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>

parent 56608400

arch/arm/boot/dts/at91sam9260.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -976,7 +976,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

Original line number	Diff line number	Diff line
		@@ -905,7 +905,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

Original line number	Diff line number	Diff line
		@@ -1116,7 +1116,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

Original line number	Diff line number	Diff line
		@@ -894,7 +894,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

Original line number	Diff line number	Diff line
		@@ -1130,7 +1130,6 @@
		atmel,watchdog-type = "hardware";
		atmel,reset-type = "all";
		atmel,dbg-halt;
		atmel,idle-halt;
		status = "disabled";
		};