clocksource/drivers/timer-ti-dm: Clear settings on probe and free
PATCH 1/1 clocksource/drivers/timer-ti-dm: Clear settings on probe and free
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.
--- drivers/clocksource/timer-ti-dm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/clocksource/timer-ti-dm.c +17 -0
@@ -633,6 +633,8 @@ static struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *nstatic 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); }
Signature · 1 line
2.37.3
The following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 822963b96dfdb72ec4fb1395fbdfa778656b49d1 Gitweb: https://git.kernel.org/tip/822963b96dfdb72ec4fb1395fbdfa778656b49d1 Author: Tony Lindgren <[email protected]> AuthorDate: Fri, 28 Oct 2022 13:38:13 +03:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Fri, 02 Dec 2022 13:16:46 +01:00
clocksource/drivers/timer-ti-dm: Clear settings on probe and free
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.
--- drivers/clocksource/timer-ti-dm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/clocksource/timer-ti-dm.c +17 -0
@@ -633,6 +633,8 @@ static struct omap_dm_timer *omap_dm_timer_request_by_node(struct device_node *nstatic 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); }