From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971AbbJFU26 (ORCPT ); Tue, 6 Oct 2015 16:28:58 -0400 Received: from mx-guillaumet.finsecur.com ([91.217.234.131]:52146 "EHLO guillaumet.finsecur.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505AbbJFU24 (ORCPT ); Tue, 6 Oct 2015 16:28:56 -0400 From: Sylvain Rochet To: Guenter Roeck , Alexandre Belloni , Boris BREZILLON , linux-kernel@vger.kernel.org, Nicolas Ferre , Ludovic Desroches , linux-arm-kernel@lists.infradead.org Cc: Sylvain Rochet , Date: Tue, 6 Oct 2015 22:28:45 +0200 Message-Id: <1444163325-3041-1-git-send-email-sylvain.rochet@finsecur.com> X-Mailer: git-send-email 2.5.1 X-SA-Exim-Connect-IP: 172.16.8.13 X-SA-Exim-Mail-From: sylvain.rochet@finsecur.com Subject: [PATCH] watchdog: at91sam9: keep watchdog running in idle mode X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on guillaumet.finsecur.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: 5161b31dc39a ("watchdog: at91sam9_wdt: better watchdog support") Cc: # 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