From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@roeck-us.net (Guenter Roeck) Date: Mon, 24 Aug 2015 05:49:55 -0700 Subject: [PATCH v2] watchdog: sunxi: fix activation of system reset In-Reply-To: References: <55B32BCE.5050506@gmail.com> <20150726193238.GM2564@lukather> Message-ID: <55DB12F3.3020100@roeck-us.net> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08/24/2015 02:25 AM, Chen-Yu Tsai wrote: > Hi, > > On Mon, Jul 27, 2015 at 3:32 AM, Maxime Ripard > wrote: >> On Sat, Jul 25, 2015 at 08:25:18AM +0200, Francesco Lavra wrote: >>> 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 >> >> Acked-by: Maxime Ripard > > What tree should this go in through? > Guenter, are you still taking watchdog patches? > The patch is included in the pull request I sent to Wim last week [1]. Guenter --- [1] http://www.spinics.net/lists/linux-watchdog/msg07219.html