|
@@ -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)
|