Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef3160cd authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent a894fcc2

arch/arm/mach-omap2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ config ARCH_OMAP4 
	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select LOCAL_TIMERS if SMP

	select OMAP_INTERCONNECT

	select PL310_ERRATA_588369

	select PL310_ERRATA_727915

arch/arm/mach-omap2/timer.c

+0 −7
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 
#endif



#ifdef CONFIG_ARCH_OMAP4

#ifdef CONFIG_LOCAL_TIMERS

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);

void __init omap4_local_timer_init(void)

{
@@ -619,12 +618,6 @@ void __init omap4_local_timer_init(void) 
			pr_err("twd_local_timer_register failed %d\n", err);

	}

}

#else /* CONFIG_LOCAL_TIMERS */

void __init omap4_local_timer_init(void)

{

	omap4_sync32k_timer_init();

}

#endif /* CONFIG_LOCAL_TIMERS */

#endif /* CONFIG_ARCH_OMAP4 */



#ifdef CONFIG_SOC_OMAP5