UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clocksource/drivers/timer-ti-dm: Add flag to detect omap1 

Let's make it clear that some features need to be tested currently on
omap1. Only omap1 still uses platform_data.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Link: https://lore.kernel.org/r/20220815131250.34603-9-tony@atomide.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Tony Lindgren 2022-08-15 16:12:49 +03:00 committed by Daniel Lezcano
parent a6e543f615
commit 664ad59da1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/clocksource/timer-ti-dm.c
View File

@ -133,6 +133,7 @@ struct dmtimer {
unsigned long rate; unsigned long rate;
unsigned reserved:1; unsigned reserved:1;
unsigned posted:1; unsigned posted:1;
unsigned omap1:1;
struct timer_regs context; struct timer_regs context;
int revision; int revision;
u32 capability; u32 capability;
@ -423,7 +424,7 @@ static int omap_dm_timer_set_source(struct omap_dm_timer *cookie, int source)
* use the clock framework to set the parent clock. To be removed * use the clock framework to set the parent clock. To be removed
* once OMAP1 migrated to using clock framework for dmtimers * once OMAP1 migrated to using clock framework for dmtimers
*/ */
if (pdata && pdata->set_timer_src) if (timer->omap1 && pdata && pdata->set_timer_src)
return pdata->set_timer_src(timer->pdev, source); return pdata->set_timer_src(timer->pdev, source);
#if defined(CONFIG_COMMON_CLK) #if defined(CONFIG_COMMON_CLK)
@ -476,7 +477,7 @@ static int omap_dm_timer_prepare(struct dmtimer *timer)
* FIXME: OMAP1 devices do not use the clock framework for dmtimers so * FIXME: OMAP1 devices do not use the clock framework for dmtimers so
* do not call clk_get() for these devices. * do not call clk_get() for these devices.
*/ */
if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) { if (!timer->omap1) {
timer->fclk = clk_get(&timer->pdev->dev, "fck"); timer->fclk = clk_get(&timer->pdev->dev, "fck");
if (WARN_ON_ONCE(IS_ERR(timer->fclk))) { if (WARN_ON_ONCE(IS_ERR(timer->fclk))) {
dev_err(&timer->pdev->dev, ": No fclk handle.\n"); dev_err(&timer->pdev->dev, ": No fclk handle.\n");
@ -763,7 +764,7 @@ static int omap_dm_timer_stop(struct omap_dm_timer *cookie)
dev = &timer->pdev->dev; dev = &timer->pdev->dev;
if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) if (!timer->omap1)
rate = clk_get_rate(timer->fclk); rate = clk_get_rate(timer->fclk);
__omap_dm_timer_stop(timer, rate); __omap_dm_timer_stop(timer, rate);
@ -1119,6 +1120,8 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
timer->reserved = omap_dm_timer_reserved_systimer(timer->id); timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
} }
timer->omap1 = timer->capability & OMAP_TIMER_NEEDS_RESET;
if (!(timer->capability & OMAP_TIMER_ALWON)) { if (!(timer->capability & OMAP_TIMER_ALWON)) {
timer->nb.notifier_call = omap_timer_context_notifier; timer->nb.notifier_call = omap_timer_context_notifier;
cpu_pm_register_notifier(&timer->nb); cpu_pm_register_notifier(&timer->nb);