Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755400AbbGFUYq (ORCPT ); Mon, 6 Jul 2015 16:24:46 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:54350 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbbGFUYh (ORCPT ); Mon, 6 Jul 2015 16:24:37 -0400 Message-ID: <559AE3FE.7090202@roeck-us.net> Date: Mon, 06 Jul 2015 13:24:30 -0700 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Francesco Lavra , wim@iguana.be, maxime.ripard@free-electrons.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] watchdog: sunxi: fix activation of system reset References: <559AC20B.4090601@gmail.com> In-Reply-To: <559AC20B.4090601@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1263 Lines: 34 On 07/06/2015 10:59 AM, Francesco Lavra wrote: > Commit f2147de3 ("watchdog: sunxi: support parameterized compatible > strings") introduced a regression in sunxi_wdt_start(), by which > the system reset function of the watchdog is not enabled upon > starting the watchdog. Fix it. > > Signed-off-by: Francesco Lavra Reviewed-by: Guenter Roeck > --- > drivers/watchdog/sunxi_wdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c > index a29afb3..47bd8a1 100644 > --- a/drivers/watchdog/sunxi_wdt.c > +++ b/drivers/watchdog/sunxi_wdt.c > @@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev) > /* Set system reset function */ > reg = readl(wdt_base + regs->wdt_cfg); > reg &= ~(regs->wdt_reset_mask); > - reg |= ~(regs->wdt_reset_val); > + reg |= regs->wdt_reset_val; > writel(reg, wdt_base + regs->wdt_cfg); > > /* Enable watchdog */ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/