ARM: OMAP2+: Clean up omap4_local_timer_init

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / timer.c

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index cac46d852da18003a21fa3d66278e11e6cf51afc..c52051b6742cb68e61f3021be036c8d2dee25100 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -649,23 +649,10 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
 
 #ifdef CONFIG_ARCH_OMAP4
 #ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
 void __init omap4_local_timer_init(void)
 {
        omap4_sync32k_timer_init();
-       /* Local timers are not supprted on OMAP4430 ES1.0 */
-       if (omap_rev() != OMAP4430_REV_ES1_0) {
-               int err;
-
-               if (of_have_populated_dt()) {
-                       clocksource_of_init();
-                       return;
-               }
-
-               err = twd_local_timer_register(&twd_local_timer);
-               if (err)
-                       pr_err("twd_local_timer_register failed %d\n", err);
-       }
+       clocksource_of_init();
 }
 #else
 void __init omap4_local_timer_init(void)