diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-11-13 18:37:49 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-11-14 17:42:46 +0100 |
| commit | 37238d3dd584dc4ce87d844681b89ef58f8200ea (patch) | |
| tree | 78b8d2869f41195101c64d0bb1025f1cbb1cf2e2 /arch/arm/mach-omap2/timer.c | |
| parent | ARM: OMAP2+: Add missing put_device() call in omapdss_init_of() (diff) | |
| download | linux-37238d3dd584dc4ce87d844681b89ef58f8200ea.tar.xz linux-37238d3dd584dc4ce87d844681b89ef58f8200ea.zip | |
ARM: OMAP2+: Drop useless gptimer option for omap4
We have local timers on Cortex-A9, so using the gptimer option makes no
sense. Let's just drop it for omap4 to simplify the timer options a bit.
If this is really needed, it can be still done by specifying dts properties
in the board specific file for assigned-clocks and assigned-clock-parents.
This gets us a bit closer to start dropping legacy platform data for
gptimers except for timer1 that is used for system clockevent.
Cc: Keerthy <j-keerthy@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 07bea84c5d6e..0d0a731cb476 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -545,7 +545,7 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop); /* Enable the use of clocksource="gp_timer" kernel parameter */ - if (use_gptimer_clksrc || gptimer) + if (clksrc_nr && (use_gptimer_clksrc || gptimer)) omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop); else @@ -586,7 +586,7 @@ void __init omap3_gptimer_timer_init(void) static void __init omap4_sync32k_timer_init(void) { __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", - 2, "sys_clkin_ck", NULL, false); + 0, NULL, NULL, false); } void __init omap4_local_timer_init(void) |