From mboxrd@z Thu Jan 1 00:00:00 1970 From: francescolavra.fl@gmail.com (Francesco Lavra) Date: Sat, 25 Jul 2015 08:25:18 +0200 Subject: [PATCH v2] watchdog: sunxi: fix activation of system reset Message-ID: <55B32BCE.5050506@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Commit f2147de33470 ("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. As a result, the system is not reset when the watchdog expires. Fix it. Signed-off-by: Francesco Lavra Reviewed-by: Guenter Roeck Fixes: f2147de33470 ("watchdog: sunxi: support parameterized compatible strings") Cc: stable at vger.kernel.org --- Changes in v2: - Added Reviewed-by, Fixes, and Cc tags - Fixed commit message --- 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 */ -- 1.9.1