1 files changed, 4 insertions, 9 deletions

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index d37df98b5c32..52e55337aa9b 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -18,8 +18,6 @@
 #include <mach/irqs.h>
 
 #ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(u5500_twd_local_timer,
-                              U5500_TWD_BASE, IRQ_LOCALTIMER);
 static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
                               U8500_TWD_BASE, IRQ_LOCALTIMER);
 
@@ -28,8 +26,8 @@ static void __init ux500_twd_init(void)
         struct twd_local_timer *twd_local_timer;
         int err;
 
-        twd_local_timer = cpu_is_u5500() ? &u5500_twd_local_timer :
-                                           &u8500_twd_local_timer;
+        /* Use this to switch local timer base if changed in new ASICs */
+        twd_local_timer = &u8500_twd_local_timer;
 
         if (of_have_populated_dt())
                 twd_local_timer_of_register();
@@ -48,10 +46,7 @@ static void __init ux500_timer_init(void)
         void __iomem *mtu_timer_base;
         void __iomem *prcmu_timer_base;
 
-        if (cpu_is_u5500()) {
-                mtu_timer_base = __io_address(U5500_MTU0_BASE);
-                prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);
-        } else if (cpu_is_u8500()) {
+        if (cpu_is_u8500()) {
                 mtu_timer_base = __io_address(U8500_MTU0_BASE);
                 prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
         } else {
@@ -70,7 +65,7 @@ static void __init ux500_timer_init(void)
          * depending on delay which is not yet calibrated. RTC-RTT is in the
          * always-on powerdomain and is used as clockevent instead of twd when
          * sleeping.
-         * The PRCMU timer 4(3 for DB5500) register a clocksource and
+         * The PRCMU timer 4 register a clocksource and
          * sched_clock with higher rating then MTU since is always-on.
          *
          */