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>

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 07bea84c5d6e4f2a42c3ca5667b47b967b32867f..0d0a731cb47691dc0ae7ed572052097e19f77910 100644 (file)
--- 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)