* [PATCH] watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog
@ 2015-11-18 2:45 Nicolas Boichat
2015-11-18 16:24 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Boichat @ 2015-11-18 2:45 UTC (permalink / raw)
To: linux-arm-kernel
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(+)
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;
--
2.6.0.rc2.230.g3dd15c0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog
2015-11-18 2:45 [PATCH] watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog Nicolas Boichat
@ 2015-11-18 16:24 ` Guenter Roeck
2015-11-20 16:51 ` Matthias Brugger
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2015-11-18 16:24 UTC (permalink / raw)
To: linux-arm-kernel
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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog
2015-11-18 16:24 ` Guenter Roeck
@ 2015-11-20 16:51 ` Matthias Brugger
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Brugger @ 2015-11-20 16:51 UTC (permalink / raw)
To: linux-arm-kernel
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;
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-20 16:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-18 2:45 [PATCH] watchdog: mtk_wdt: Use MODE_KEY when stopping the watchdog Nicolas Boichat
2015-11-18 16:24 ` Guenter Roeck
2015-11-20 16:51 ` Matthias Brugger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).