Commit 0328d816 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

arm: omap2: timer: always define omap4_local_timer_init 



omap4_local_timer_init() can be used by other
platforms as is. At least AM437x wants to use
it. Instead of making omap4-only and providing
a stub for builds without OMAP4, we can just
make sure that function is always available
for all SoCs that need it.

Reported-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 049e6dde

arch/arm/mach-omap2/timer.c

+3 −13
Original line number Diff line number Diff line
@@ -630,32 +630,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 
			2, "timer_sys_ck", NULL);

#endif /* CONFIG_ARCH_OMAP3 */



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \

	defined(CONFIG_SOC_AM43XX)

#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)

OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL,

		       1, "timer_sys_ck", "ti,timer-alwon");

#endif



#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \

	defined(CONFIG_SOC_DRA7XX)

	defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)

static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",

			       2, "sys_clkin_ck", NULL);

#endif



#ifdef CONFIG_ARCH_OMAP4

#ifdef CONFIG_HAVE_ARM_TWD

void __init omap4_local_timer_init(void)

{

	omap4_sync32k_timer_init();

	clocksource_of_init();

}

#else

void __init omap4_local_timer_init(void)

{

	omap4_sync32k_timer_init();

}

#endif /* CONFIG_HAVE_ARM_TWD */

#endif /* CONFIG_ARCH_OMAP4 */

#endif



#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)

void __init omap5_realtime_timer_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE