Merge branch 'stericsson/cleanup' into next/timer

The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

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

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/mach-ux500/Makefile
index be915a1,9fd00a6..6bd2f45
--- 1/arch/arm/mach-ux500/Makefile
--- 2/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@@ -3,7 -3,8 +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 --combined arch/arm/mach-ux500/cpu.c
index 797f364,252e8b3..1405d0e
--- 1/arch/arm/mach-ux500/cpu.c
--- 2/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@@ -10,14 -10,12 +10,12 @@@
  #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>
  
 -#include <plat/mtu.h>
  #include <mach/hardware.h>
  #include <mach/setup.h>
  #include <mach/devices.h>
@@@ -26,10 -24,6 +24,6 @@@
  
  void __iomem *_PRCMU_BASE;
  
- #ifdef CONFIG_CACHE_L2X0
- static void __iomem *l2x0_base;
- #endif
- 
  void __init ux500_init_irq(void)
  {
        void __iomem *dist_base;
@@@ -56,66 -50,30 +50,3 @@@
                prcmu_early_init();
        clk_init();
  }
- 
- #ifdef CONFIG_CACHE_L2X0
- static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask)
- {
-       /* 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)
 -static void __init ux500_timer_init(void)
--{
 -#ifdef CONFIG_LOCAL_TIMERS
 -      /* Setup the local timer base */
--      if (cpu_is_u5500())
-               l2x0_base = __io_address(U5500_L2CC_BASE);
 -              twd_base = __io_address(U5500_TWD_BASE);
--      else if (cpu_is_u8500())
-               l2x0_base = __io_address(U8500_L2CC_BASE);
 -              twd_base = __io_address(U8500_TWD_BASE);
--      else
--              ux500_unknown_soc();
- 
-       /* 64KB way size, 8 way associativity, force WA */
-       l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff);
- 
-       /* Override invalidate function */
-       outer_cache.disable = ux500_l2x0_disable;
-       outer_cache.inv_all = ux500_l2x0_inv_all;
 -#endif
 -      if (cpu_is_u5500())
 -              mtu_base = __io_address(U5500_MTU0_BASE);
 -      else if (cpu_is_u8500ed())
 -              mtu_base = __io_address(U8500_MTU0_BASE_ED);
 -      else if (cpu_is_u8500())
 -              mtu_base = __io_address(U8500_MTU0_BASE);
 -      else
 -              ux500_unknown_soc();
--
-       return 0;
 -      nmdk_timer_init();
--}
- early_initcall(ux500_l2x0_init);
- #endif
 -
 -struct sys_timer ux500_timer = {
 -      .init   = ux500_timer_init,
 -};