[PATCH 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled
From: linux@roeck-us.net (Guenter Roeck)
Date: 2015-07-22 03:48:52
Also in:
linux-mediatek, linux-watchdog, lkml
From: linux@roeck-us.net (Guenter Roeck)
Date: 2015-07-22 03:48:52
Also in:
linux-mediatek, linux-watchdog, lkml
On 07/21/2015 08:26 PM, Eddie Huang wrote:
From: Greta Zhang <redacted> Without .shutdown(), watchdog might reset the system during power off. For example, if watchdog's timeout is set to 30s, then it is reset to zero by mtk_wdt_ping(). During power off, no app will ping watchdog, but watchdog is still running and may trigger reset. Signed-off-by: Greta Zhang <redacted> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> --- drivers/watchdog/mtk_wdt.c | 9 +++++++++ 1 file changed, 9 insertions(+)diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 5ef3910..c6741a5 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c@@ -217,6 +217,14 @@ static int mtk_wdt_probe(struct platform_device *pdev) return 0; } +static void mtk_wdt_shutdown(struct platform_device *pdev) +{ + struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev); + + if (mtk_wdt->started)
watchdog_active() ?
+ mtk_wdt_stop(&mtk_wdt->wdt_dev); +} + static int mtk_wdt_remove(struct platform_device *pdev) { struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);@@ -266,6 +274,7 @@ MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids); static struct platform_driver mtk_wdt_driver = { .probe = mtk_wdt_probe, .remove = mtk_wdt_remove, + .shutdown = mtk_wdt_shutdown, .suspend = mtk_wdt_suspend, .resume = mtk_wdt_resume, .driver = {