aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/timer.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-03-04 22:24:35 -0500
committerStephen Boyd <sboyd@codeaurora.org>2013-06-24 20:45:58 -0400
commitef3160cd2f0a400751f2cf6fd2811225fee1d5a7 (patch)
treec9b93b4c5366365065a2c99603283c20906f540a /arch/arm/mach-omap2/timer.c
parenta894fcc2d01a89e6fe3da0845a4d80a5312e1124 (diff)
ARM: OMAP2+: Divorce from local timer API
Now that the TWD doesn't rely on the local timer API, OMAP can stop selecting it in Kconfig and relying on the config option to decide if it should call smp_twd functions. Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r--arch/arm/mach-omap2/timer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 4c069b0cab21..3b7cabacbcf5 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -600,7 +600,6 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
600#endif 600#endif
601 601
602#ifdef CONFIG_ARCH_OMAP4 602#ifdef CONFIG_ARCH_OMAP4
603#ifdef CONFIG_LOCAL_TIMERS
604static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); 603static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
605void __init omap4_local_timer_init(void) 604void __init omap4_local_timer_init(void)
606{ 605{
@@ -619,12 +618,6 @@ void __init omap4_local_timer_init(void)
619 pr_err("twd_local_timer_register failed %d\n", err); 618 pr_err("twd_local_timer_register failed %d\n", err);
620 } 619 }
621} 620}
622#else /* CONFIG_LOCAL_TIMERS */
623void __init omap4_local_timer_init(void)
624{
625 omap4_sync32k_timer_init();
626}
627#endif /* CONFIG_LOCAL_TIMERS */
628#endif /* CONFIG_ARCH_OMAP4 */ 621#endif /* CONFIG_ARCH_OMAP4 */
629 622
630#ifdef CONFIG_SOC_OMAP5 623#ifdef CONFIG_SOC_OMAP5