Commit f1826833 authored by Anson Huang's avatar Anson Huang Committed by Wim Van Sebroeck
Browse files

watchdog: imx7ulp: Move suspend/resume to noirq phase 



The i.MX7ULP's watchdog is enabled by default when out of reset, so the
resume callback which is to disable watchdog should be called earlier
to avoid unexpected timeout, move suspend/resume callback to noirq phase.

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarAlice Guo <alice.guo@nxp.com>
Reviewed-by: default avatarJacky Bai <ping.bai@nxp.com>
Tested-by: default avatarPeter Chen <peter.chen@nxp.com>
Tested-by: default avatarLi Jun <jun.li@nxp.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20220825083256.14565-2-alice.guo@oss.nxp.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent a1f136fd

drivers/watchdog/imx7ulp_wdt.c

+6 −4
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int imx7ulp_wdt_probe(struct platform_device *pdev) 
	return devm_watchdog_register_device(dev, wdog);

}



static int __maybe_unused imx7ulp_wdt_suspend(struct device *dev)

static int __maybe_unused imx7ulp_wdt_suspend_noirq(struct device *dev)

{

	struct imx7ulp_wdt_device *imx7ulp_wdt = dev_get_drvdata(dev);
@@ -267,7 +267,7 @@ static int __maybe_unused imx7ulp_wdt_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused imx7ulp_wdt_resume(struct device *dev)

static int __maybe_unused imx7ulp_wdt_resume_noirq(struct device *dev)

{

	struct imx7ulp_wdt_device *imx7ulp_wdt = dev_get_drvdata(dev);

	u32 timeout = imx7ulp_wdt->wdd.timeout * WDOG_CLOCK_RATE;
@@ -286,8 +286,10 @@ static int __maybe_unused imx7ulp_wdt_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(imx7ulp_wdt_pm_ops, imx7ulp_wdt_suspend,

			 imx7ulp_wdt_resume);

static const struct dev_pm_ops imx7ulp_wdt_pm_ops = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(imx7ulp_wdt_suspend_noirq,

				      imx7ulp_wdt_resume_noirq)

};



static const struct of_device_id imx7ulp_wdt_dt_ids[] = {

	{ .compatible = "fsl,imx7ulp-wdt", },