Commit 1f87c578 authored by Frank Li's avatar Frank Li Committed by Wim Van Sebroeck
Browse files

watchdog: imx7ulp_wdt: move post_rcs_wait into struct imx_wdt_hw_feature 



Move post_rcs_wait into struct imx_wdt_hw_feature to simple code logic for
difference compatible string.

i.MX93 watchdog needn't wait 2.5 clocks after RCS is done. So needn't set
post_rcs_wait.

Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Signed-off-by: default avatarAlice Guo <alice.guo@nxp.com>
Reviewed-by: default avatarYe Li <ye.li@nxp.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240730145610.2177627-1-Frank.Li@nxp.com


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

drivers/watchdog/imx7ulp_wdt.c

+9 −12
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" 


struct imx_wdt_hw_feature {

	bool prescaler_enable;

	bool post_rcs_wait;

	u32 wdog_clock_rate;

};
@@ -62,7 +63,6 @@ struct imx7ulp_wdt_device { 
	struct watchdog_device wdd;

	void __iomem *base;

	struct clk *clk;

	bool post_rcs_wait;

	bool ext_reset;

	const struct imx_wdt_hw_feature *hw;

};
@@ -95,7 +95,7 @@ static int imx7ulp_wdt_wait_rcs(struct imx7ulp_wdt_device *wdt) 
		ret = -ETIMEDOUT;



	/* Wait 2.5 clocks after RCS done */

	if (wdt->post_rcs_wait)

	if (wdt->hw->post_rcs_wait)

		usleep_range(wait_min, wait_min + 2000);



	return ret;
@@ -334,15 +334,6 @@ static int imx7ulp_wdt_probe(struct platform_device *pdev) 
	/* The WDOG may need to do external reset through dedicated pin */

	imx7ulp_wdt->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output");



	imx7ulp_wdt->post_rcs_wait = true;

	if (of_device_is_compatible(dev->of_node,

				    "fsl,imx8ulp-wdt")) {

		dev_info(dev, "imx8ulp wdt probe\n");

		imx7ulp_wdt->post_rcs_wait = false;

	} else {

		dev_info(dev, "imx7ulp wdt probe\n");

	}



	wdog = &imx7ulp_wdt->wdd;

	wdog->info = &imx7ulp_wdt_info;

	wdog->ops = &imx7ulp_wdt_ops;
@@ -403,6 +394,12 @@ static const struct dev_pm_ops imx7ulp_wdt_pm_ops = { 
static const struct imx_wdt_hw_feature imx7ulp_wdt_hw = {

	.prescaler_enable = false,

	.wdog_clock_rate = 1000,

	.post_rcs_wait = true,

};



static const struct imx_wdt_hw_feature imx8ulp_wdt_hw = {

	.prescaler_enable = false,

	.wdog_clock_rate = 1000,

};



static const struct imx_wdt_hw_feature imx93_wdt_hw = {
@@ -411,8 +408,8 @@ static const struct imx_wdt_hw_feature imx93_wdt_hw = { 
};



static const struct of_device_id imx7ulp_wdt_dt_ids[] = {

	{ .compatible = "fsl,imx8ulp-wdt", .data = &imx7ulp_wdt_hw, },

	{ .compatible = "fsl,imx7ulp-wdt", .data = &imx7ulp_wdt_hw, },

	{ .compatible = "fsl,imx8ulp-wdt", .data = &imx8ulp_wdt_hw, },

	{ .compatible = "fsl,imx93-wdt", .data = &imx93_wdt_hw, },

	{ /* sentinel */ }

};