From patchwork Tue Oct 6 20:28:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Rochet X-Patchwork-Id: 7339931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4789CBEEA4 for ; Tue, 6 Oct 2015 20:31:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E9B02064B for ; Tue, 6 Oct 2015 20:31:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72BDB20648 for ; Tue, 6 Oct 2015 20:31:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjYrN-0000Cf-NU; Tue, 06 Oct 2015 20:29:17 +0000 Received: from mx-guillaumet.finsecur.com ([91.217.234.131] helo=guillaumet.finsecur.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjYrL-0008WK-7J for linux-arm-kernel@lists.infradead.org; Tue, 06 Oct 2015 20:29:15 +0000 Received: from [172.16.8.13] (helo=spice.lan) by guillaumet.finsecur.com with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZjYqw-0002sY-6c; Tue, 06 Oct 2015 22:28:50 +0200 Received: from gradator by spice.lan with local (Exim 4.86) (envelope-from ) id 1ZjYqv-0000oP-V7; Tue, 06 Oct 2015 22:28:49 +0200 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 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) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151006_132915_467320_CED34E00 X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sylvain Rochet , stable@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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+ Acked-by: Alexandre Belloni --- 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;