Merge branch 'next/timer' into for-next

Conflicts:
	arch/arm/mach-ux500/Makefile
	arch/arm/mach-ux500/cpu.c

diff --cc arch/arm/mach-ux500/Makefile
index 9fd00a6d4248d3a66c8547eeec757ee31c36e885,be915a1ac4046cb3beaabb7f35105b6f787880d5..6bd2f451c185518522f4b72b227b8075df9aed6c
--- 1/arch/arm/mach-ux500/Makefile
--- 2/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@@ -3,8 -3,7 +3,8 @@@
  #
  
  obj-y                         := clock.o cpu.o devices.o devices-common.o \
-                                  id.o usb.o
+                                  id.o usb.o timer.o
 +obj-$(CONFIG_CACHE_L2X0)      += cache-l2x0.o
  obj-$(CONFIG_UX500_SOC_DB5500)        += cpu-db5500.o dma-db5500.o
  obj-$(CONFIG_UX500_SOC_DB8500)        += cpu-db8500.o devices-db8500.o
  obj-$(CONFIG_MACH_U8500)      += board-mop500.o board-mop500-sdi.o \

diff --cc arch/arm/mach-ux500/cpu.c
index 252e8b3c570649a2248918bb261cc7e67ba824a3,797f3642fc304dcd9d07df122462b19af906387f..1405d0eb7edb1ff11de52d87553c8346c6f638d1
--- 1/arch/arm/mach-ux500/cpu.c
--- 2/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@@ -10,7 -10,10 +10,8 @@@
  #include <linux/clk.h>
  #include <linux/mfd/db8500-prcmu.h>
  #include <linux/mfd/db5500-prcmu.h>
+ #include <linux/clksrc-dbx500-prcmu.h>
  
 -#include <asm/cacheflush.h>
 -#include <asm/hardware/cache-l2x0.h>
  #include <asm/hardware/gic.h>
  #include <asm/mach/map.h>
  #include <asm/localtimer.h>
@@@ -50,30 -56,66 +50,3 @@@ void __init ux500_init_irq(void
                prcmu_early_init();
        clk_init();
  }
--
- static void __init ux500_timer_init(void)
 -#ifdef CONFIG_CACHE_L2X0
 -static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
--{
- #ifdef CONFIG_LOCAL_TIMERS
-       /* Setup the local timer base */
-       if (cpu_is_u5500())
-               twd_base = __io_address(U5500_TWD_BASE);
-       else if (cpu_is_u8500())
-               twd_base = __io_address(U8500_TWD_BASE);
-       else
-               ux500_unknown_soc();
- #endif
 -      /* wait for the operation to complete */
 -      while (readl_relaxed(reg) & mask)
 -              ;
 -}
 -
 -static inline void ux500_cache_sync(void)
 -{
 -      void __iomem *base = l2x0_base;
 -
 -      writel_relaxed(0, base + L2X0_CACHE_SYNC);
 -      ux500_cache_wait(base + L2X0_CACHE_SYNC, 1);
 -}
 -
 -/*
 - * The L2 cache cannot be turned off in the non-secure world.
 - * Dummy until a secure service is in place.
 - */
 -static void ux500_l2x0_disable(void)
 -{
 -}
 -
 -/*
 - * This is only called when doing a kexec, just after turning off the L2
 - * and L1 cache, and it is surrounded by a spinlock in the generic version.
 - * However, we're not really turning off the L2 cache right now and the
 - * PL310 does not support exclusive accesses (used to implement the spinlock).
 - * So, the invalidation needs to be done without the spinlock.
 - */
 -static void ux500_l2x0_inv_all(void)
 -{
 -      void __iomem *base = l2x0_base;
 -      uint32_t l2x0_way_mask = (1<<16) - 1;   /* Bitmask of active ways */
 -
 -      /* invalidate all ways */
 -      writel_relaxed(l2x0_way_mask, base + L2X0_INV_WAY);
 -      ux500_cache_wait(base + L2X0_INV_WAY, l2x0_way_mask);
 -      ux500_cache_sync();
 -}
 -
 -static int ux500_l2x0_init(void)
 -{
--      if (cpu_is_u5500())
-               mtu_base = __io_address(U5500_MTU0_BASE);
-       else if (cpu_is_u8500ed())
-               mtu_base = __io_address(U8500_MTU0_BASE_ED);
 -              l2x0_base = __io_address(U5500_L2CC_BASE);
--      else if (cpu_is_u8500())
-               mtu_base = __io_address(U8500_MTU0_BASE);
 -              l2x0_base = __io_address(U8500_L2CC_BASE);
--      else
--              ux500_unknown_soc();
--
-       nmdk_timer_init();
- }
 -      /* 64KB way size, 8 way associativity, force WA */
 -      l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff);
--
- struct sys_timer ux500_timer = {
-       .init   = ux500_timer_init,
- };
 -      /* Override invalidate function */
 -      outer_cache.disable = ux500_l2x0_disable;
 -      outer_cache.inv_all = ux500_l2x0_inv_all;
 -
 -      return 0;
 -}
 -early_initcall(ux500_l2x0_init);
 -#endif