From d9189e251995cc91efcac62a8d1c59ff32cdb8dc Mon Sep 17 00:00:00 2001 From: Robin Gong <yibin.gong@nxp.com> Date: Fri, 22 Feb 2019 18:43:35 +0800 Subject: [PATCH] MLK-20965: watchdog: imx8_wdt: remove watchdog action set The default watchdog action is partition reset now, so no need kernel to take care. Besides, scfw full test case may set other watchdog action but kernel may set it back later to default partition reset which scfw wouldn't expect, so avoid touching watchdog action. Please modify scfw code in case changing watchdog action to board reset. Signed-off-by: Robin Gong <yibin.gong@nxp.com> Reviewed-by: Anson Huang <anson.huang@nxp.com> --- drivers/watchdog/imx8_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/imx8_wdt.c b/drivers/watchdog/imx8_wdt.c index 8656ff523523a2..7a855012366a74 100644 --- a/drivers/watchdog/imx8_wdt.c +++ b/drivers/watchdog/imx8_wdt.c @@ -72,10 +72,8 @@ static int imx8_wdt_start(struct watchdog_device *wdog) &res); if (res.a0) return res.a0; - /* TODO: change to SC_TIMER_WDOG_ACTION_PARTITION after SCFW support */ - arm_smccc_smc(FSL_SIP_SRTC, FSL_SIP_SRTC_SET_WDOG_ACT, - SC_TIMER_WDOG_ACTION_PARTITION, 0, 0, 0, 0, 0, &res); - return res.a0; + + return 0; } static int imx8_wdt_stop(struct watchdog_device *wdog) -- GitLab