Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: imx7ulp_wdt: move post_rcs_wait into struct imx_wdt_hw_feature

Browse Source 
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: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Alice Guo <alice.guo@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240730145610.2177627-1-Frank.Li@nxp.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
Frank Li 2024-07-30 10:56:10 -04:00 committed by Wim Van Sebroeck
parent bc83b4d1f0
commit 1f87c578d9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/watchdog/imx7ulp_wdt.c
View File

@ -55,6 +55,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
struct imx_wdt_hw_feature { struct imx_wdt_hw_feature {
bool prescaler_enable; bool prescaler_enable;
bool post_rcs_wait;
u32 wdog_clock_rate; u32 wdog_clock_rate;
}; };
@ -62,7 +63,6 @@ struct imx7ulp_wdt_device {
struct watchdog_device wdd; struct watchdog_device wdd;
void __iomem *base; void __iomem *base;
struct clk *clk; struct clk *clk;
bool post_rcs_wait;
bool ext_reset; bool ext_reset;
const struct imx_wdt_hw_feature *hw; const struct imx_wdt_hw_feature *hw;
}; };
@ -95,7 +95,7 @@ static int imx7ulp_wdt_wait_rcs(struct imx7ulp_wdt_device *wdt)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
/* Wait 2.5 clocks after RCS done */ /* 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); usleep_range(wait_min, wait_min + 2000);
return ret; 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 */ /* 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->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 = &imx7ulp_wdt->wdd;
wdog->info = &imx7ulp_wdt_info; wdog->info = &imx7ulp_wdt_info;
wdog->ops = &imx7ulp_wdt_ops; 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 = { static const struct imx_wdt_hw_feature imx7ulp_wdt_hw = {
.prescaler_enable = false, .prescaler_enable = false,
.wdog_clock_rate = 1000, .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 = { 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[] = { 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,imx7ulp-wdt", .data = &imx7ulp_wdt_hw, },
{ .compatible = "fsl,imx8ulp-wdt", .data = &imx8ulp_wdt_hw, },
{ .compatible = "fsl,imx93-wdt", .data = &imx93_wdt_hw, }, { .compatible = "fsl,imx93-wdt", .data = &imx93_wdt_hw, },
{ /* sentinel */ } { /* sentinel */ }
}; };