clocksource/drivers/timer-ti-dm: Clear settings on probe and free
authorTony Lindgren <tony@atomide.com>
Fri, 28 Oct 2022 10:38:13 +0000 (13:38 +0300)
committerDaniel Lezcano <daniel.lezcano@kernel.org>
Fri, 2 Dec 2022 12:16:46 +0000 (13:16 +0100)
Clear the timer control register on driver probe and omap_dm_timer_free().
Otherwise we assume the consumer driver takes care of properly
initializing timer interrupts on PWM driver module reload for example.

AFAIK this is not currently needed as a fix, I just happened to run into
this while cleaning up things.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20221028103813.40783-1-tony@atomide.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
drivers/clocksource/timer-ti-dm.c

index eeeeb3c..b24b903 100644 (file)
@@ -633,6 +633,8 @@ static struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *n
 static int omap_dm_timer_free(struct omap_dm_timer *cookie)
 {
        struct dmtimer *timer;
+       struct device *dev;
+       int rc;
 
        timer = to_dmtimer(cookie);
        if (unlikely(!timer))
@@ -640,6 +642,17 @@ static int omap_dm_timer_free(struct omap_dm_timer *cookie)
 
        WARN_ON(!timer->reserved);
        timer->reserved = 0;
+
+       dev = &timer->pdev->dev;
+       rc = pm_runtime_resume_and_get(dev);
+       if (rc)
+               return rc;
+
+       /* Clear timer configuration */
+       dmtimer_write(timer, OMAP_TIMER_CTRL_REG, 0);
+
+       pm_runtime_put_sync(dev);
+
        return 0;
 }
 
@@ -1135,6 +1148,10 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                        goto err_disable;
                }
                __omap_dm_timer_init_regs(timer);
+
+               /* Clear timer configuration */
+               dmtimer_write(timer, OMAP_TIMER_CTRL_REG, 0);
+
                pm_runtime_put(dev);
        }