| Message ID | 1447814701-23504-1-git-send-email-drinkcat@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/17/2015 06:45 PM, Nicolas Boichat wrote: > WDT_MODE value need to be or-ed with MODE_KEY when setting > watchdog mode. Add it to mtk_wdt_stop function, so that the > watchdog can be stopped (e.g. during suspend). > > Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/mtk_wdt.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c > index 6ad9df9..b751f43 100644 > --- a/drivers/watchdog/mtk_wdt.c > +++ b/drivers/watchdog/mtk_wdt.c > @@ -123,6 +123,7 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev) > > reg = readl(wdt_base + WDT_MODE); > reg &= ~WDT_MODE_EN; > + reg |= WDT_MODE_KEY; > iowrite32(reg, wdt_base + WDT_MODE); > > return 0; >
On 18/11/15 17:24, Guenter Roeck wrote: > On 11/17/2015 06:45 PM, Nicolas Boichat wrote: >> WDT_MODE value need to be or-ed with MODE_KEY when setting >> watchdog mode. Add it to mtk_wdt_stop function, so that the >> watchdog can be stopped (e.g. during suspend). >> >> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > >> --- >> drivers/watchdog/mtk_wdt.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c >> index 6ad9df9..b751f43 100644 >> --- a/drivers/watchdog/mtk_wdt.c >> +++ b/drivers/watchdog/mtk_wdt.c >> @@ -123,6 +123,7 @@ static int mtk_wdt_stop(struct watchdog_device >> *wdt_dev) >> >> reg = readl(wdt_base + WDT_MODE); >> reg &= ~WDT_MODE_EN; >> + reg |= WDT_MODE_KEY; >> iowrite32(reg, wdt_base + WDT_MODE); >> >> return 0; >> >
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 6ad9df9..b751f43 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -123,6 +123,7 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev) reg = readl(wdt_base + WDT_MODE); reg &= ~WDT_MODE_EN; + reg |= WDT_MODE_KEY; iowrite32(reg, wdt_base + WDT_MODE); return 0;
WDT_MODE value need to be or-ed with MODE_KEY when setting watchdog mode. Add it to mtk_wdt_stop function, so that the watchdog can be stopped (e.g. during suspend). Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> --- drivers/watchdog/mtk_wdt.c | 1 + 1 file changed, 1 insertion(+)