[v2,1/1] watchdog: imx7ulp_wdt: move post_rcs_wait into struct imx_wdt_hw_feature

Commit Message

Frank Li July 12, 2024, 2:18 p.m. UTC

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: Alice Guo <[e-mail]>
Reviewed-by: Ye Li <[e-mail]>
Signed-off-by: Frank Li <[e-mail]>
---
Change from v1 to v2
- Combine to one patch
---
 drivers/watchdog/imx7ulp_wdt.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Comments

Fabio Estevam July 12, 2024, 2:30 p.m. UTC | #1

On Fri, Jul 12, 2024 at 11:19 AM Frank Li <[e-mail]> wrote:
>
> 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

s/needn't/does not need

You mention i.MX93 here, but the code touches i.MX8ULP. Is that correct?

Frank Li July 12, 2024, 2:38 p.m. UTC | #2

On Fri, Jul 12, 2024 at 11:30:14AM -0300, Fabio Estevam wrote:
> On Fri, Jul 12, 2024 at 11:19 AM Frank Li <[e-mail]> wrote:
> >
> > 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
> 
> s/needn't/does not need
> 
> You mention i.MX93 here, but the code touches i.MX8ULP. Is that correct?

Yes, default is disabled. 

Please ref v1
https://lore.kernel.org/imx/[e-mail]/T/#t

Fabio Estevam July 12, 2024, 2:54 p.m. UTC | #3

On Fri, Jul 12, 2024 at 11:38 AM Frank Li <[e-mail]> wrote:

> Yes, default is disabled.
>
> Please ref v1
> https://lore.kernel.org/imx/[e-mail]/T/#t

I understand that.

My point is about the commit log: you mention i.MX93, but you change
i.MX8ULP. This is confusing.

Also, better to explicitly pass .prescaler_enable = false inside
imx93_wdt_hw for consistency.

Guenter Roeck July 12, 2024, 3:03 p.m. UTC | #4

On 7/12/24 07:18, Frank Li wrote:
> 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: Alice Guo <[e-mail]>
> Reviewed-by: Ye Li <[e-mail]>
> Signed-off-by: Frank Li <[e-mail]>

Reviewed-by: Guenter Roeck <[e-mail]>

Patch

diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c
index 94914a22daff7..3a75a6f98f8f0 100644
--- a/drivers/watchdog/imx7ulp_wdt.c
+++ b/drivers/watchdog/imx7ulp_wdt.c
@@ -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,7 +408,7 @@  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,imx8ulp-wdt", .data = &imx8ulp_wdt_hw, },
 	{ .compatible = "fsl,imx7ulp-wdt", .data = &imx7ulp_wdt_hw, },
 	{ .compatible = "fsl,imx93-wdt", .data = &imx93_wdt_hw, },
 	{ /* sentinel */ }