Patch "watchdog: sunxi: fix activation of system reset" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

watchdog: sunxi: fix activation of system reset

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
watchdog-sunxi-fix-activation-of-system-reset.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Francesco Lavra <[email protected]>
Date: Sat, 25 Jul 2015 08:25:18 +0200
Subject: watchdog: sunxi: fix activation of system reset

From: Francesco Lavra <[email protected]>

commit 0919e4445190da18496d31aac08b90828a47d45f upstream.

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.

---
 drivers/watchdog/sunxi_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchd
 	/* 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 */

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/watchdog-sunxi-fix-activation-of-system-reset.patch