linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] watchdog: at91sam9: keep watchdog running in idle mode
@ 2015-10-06 20:28 Sylvain Rochet
  2015-10-07 11:01 ` Alexandre Belloni
  0 siblings, 1 reply; 6+ messages in thread
From: Sylvain Rochet @ 2015-10-06 20:28 UTC (permalink / raw)
  To: linux-arm-kernel

Since turning on idle-halt in commit 5161b31dc39a (watchdog:
at91sam9_wdt: better watchdog support"), SoCs compatible with
at91sam9260-wdt not using a device tree no longer reboot if the watchdog
times out while the CPU is in idle state. Removing the
AT91_WDT_WDIDLEHLT flag that was set by default fixes this.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support")
Cc: <stable@vger.kernel.org> # 3.14+
---
 drivers/watchdog/at91sam9_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 7e6acaf..6e3a167 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -339,7 +339,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD |
-		  AT91_WDT_WDDBGHLT | AT91_WDT_WDIDLEHLT;
+		  AT91_WDT_WDDBGHLT;
 	wdt->mr_mask = 0x3FFFFFFF;
 	wdt->nowayout = nowayout;
 	wdt->wdd.parent = &pdev->dev;
-- 
2.5.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-10-16 20:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-06 20:28 [PATCH] watchdog: at91sam9: keep watchdog running in idle mode Sylvain Rochet
2015-10-07 11:01 ` Alexandre Belloni
2016-10-16 15:33   ` Sylvain Rochet
2016-10-16 15:50     ` Guenter Roeck
2016-10-16 15:55       ` Guenter Roeck
2016-10-16 20:39         ` Sylvain Rochet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).