korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 01:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: sunxi: fix activation of system reset

Browse Source 
Commit f2147de334 ("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.

Fixes: f2147de334 ("watchdog: sunxi: support parameterized compatible strings")
Signed-off-by: Francesco Lavra <francescolavra.fl@gmail.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable@vger.kernel.org
This commit is contained in:
Francesco Lavra 2015-07-25 08:25:18 +02:00 committed by Wim Van Sebroeck
parent 5724485b18
commit 0919e44451
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/sunxi_wdt.c
View File

@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev)
/* Set system reset function */ /* Set system reset function */
reg = readl(wdt_base + regs->wdt_cfg); reg = readl(wdt_base + regs->wdt_cfg);
reg &= ~(regs->wdt_reset_mask); reg &= ~(regs->wdt_reset_mask);
reg |= ~(regs->wdt_reset_val); reg |= regs->wdt_reset_val;
writel(reg, wdt_base + regs->wdt_cfg); writel(reg, wdt_base + regs->wdt_cfg);
/* Enable watchdog */ /* Enable watchdog */