From: Zhao Qiang <qiang.zhao@nxp.com>
Date: Fri, 27 Nov 2020 07:52:17 +0000 (+0800)
Subject: wdt: sp805: add watchdog_stop on reboot
X-Git-Tag: v5.11-rc1~31^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42e967f3c6cb3828f07a3822d7249bccb55221a4;p=thirdparty%2Fkernel%2Flinux.git

wdt: sp805: add watchdog_stop on reboot

Call watchdog_stop_on_reboot in probe func

Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20201127075217.31312-1-qiang.zhao@nxp.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
---

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 190d26e2e75f9..958dc32a708fb 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -291,6 +291,7 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
 		set_bit(WDOG_HW_RUNNING, &wdt->wdd.status);
 	}
 
+	watchdog_stop_on_reboot(&wdt->wdd);
 	ret = watchdog_register_device(&wdt->wdd);
 	if (ret)
 		goto err;