Merge tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull ARM SoC multiplatform updates from Olof Johansson:
 "More multiplatform enablement for ARM platforms.  The ones converted
  in this branch are:

   - bcm2835
   - cns3xxx
   - sirf
   - nomadik
   - msx
   - spear
   - tegra
   - ux500

  We're getting close to having most of them converted!

  One of the larger platforms remaining is Samsung Exynos, and there are
  a bunch of supporting patches in this merge window for it.  There was
  a patch in this branch to a early version of multiplatform conversion,
  but it ended up being reverted due to need of more bake time.  The
  revert commit is part of the branch since it would have required
  rebasing multiple dependent branches and they were stable by then"

* tag 'multiplatform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (70 commits)
  mmc: sdhci-s3c: Fix operation on non-single image Samsung platforms
  clocksource: nomadik-mtu: fix up clocksource/timer
  Revert "ARM: exynos: enable multiplatform support"
  ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
  ARM: exynos: enable multiplatform support
  rtc: s3c: make header file local
  mtd: onenand/samsung: make regs-onenand.h file local
  thermal/exynos: remove unnecessary header inclusions
  mmc: sdhci-s3c: remove platform dependencies
  ARM: samsung: move mfc device definition to s5p-dev-mfc.c
  ARM: exynos: move debug-macro.S to include/debug/
  ARM: exynos: prepare for sparse IRQ
  ARM: exynos: introduce EXYNOS_ATAGS symbol
  ARM: tegra: build assembly files with -march=armv7-a
  ARM: Push selects for TWD/SCU into machine entries
  ARM: ux500: build hotplug.o for ARMv7-a
  ARM: ux500: move to multiplatform
  ARM: ux500: make remaining headers local
  ARM: ux500: make irqs.h local to platform
  ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/configs/bcm2835_defconfig
Simple merge

diff --cc arch/arm/configs/mxs_defconfig
Simple merge

diff --cc arch/arm/mach-cns3xxx/cns3xxx.h
Simple merge

diff --cc arch/arm/mach-cns3xxx/core.c
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc arch/arm/mach-imx/Kconfig
Simple merge

diff --cc arch/arm/mach-mxs/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-prima2/platsmp.c
Simple merge

diff --cc arch/arm/mach-spear/platsmp.c
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/powergate.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-sdi.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
index 574916b,0d59e1a..a15dd6b
--- 1/arch/arm/mach-ux500/board-mop500.c
--- 2/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@ -663,9 -565,7 +606,8 @@@ static struct platform_device *snowball
        &snowball_key_dev,
        &snowball_sbnet_dev,
        &snowball_gpio_en_3v3_regulator_dev,
-       &u8500_thsens_device,
        &u8500_cpufreq_cooling_device,
 +      &sdi0_regulator,
  };
  
  static void __init mop500_init_machine(void)

diff --cc arch/arm/mach-ux500/board-mop500.h
Simple merge

diff --cc arch/arm/mach-ux500/cache-l2x0.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpuidle.c
index 488e074,654115a..317a2be
--- 1/arch/arm/mach-ux500/cpuidle.c
--- 2/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@@ -19,8 -21,11 +20,10 @@@
  #include <asm/cpuidle.h>
  #include <asm/proc-fns.h>
  
+ #include "db8500-regs.h"
+ 
  static atomic_t master = ATOMIC_INIT(0);
  static DEFINE_SPINLOCK(master_lock);
 -static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device);
  
  static inline int ux500_enter_idle(struct cpuidle_device *dev,
                                   struct cpuidle_driver *drv, int index)
@@@ -109,9 -118,22 +112,9 @@@ static struct cpuidle_driver ux500_idle
        .state_count = 2,
  };
  
 -/*
 - * For each cpu, setup the broadcast timer because we will
 - * need to migrate the timers for the states >= ApIdle.
 - */
 -static void ux500_setup_broadcast_timer(void *arg)
 -{
 -      int cpu = smp_processor_id();
 -      clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
 -}
 -
  int __init ux500_idle_init(void)
  {
-         /* Configure wake up reasons */
 -      int ret, cpu;
 -      struct cpuidle_device *device;
 -
+       /* Configure wake up reasons */
        prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
                             PRCMU_WAKEUP(ABB));
  

diff --cc arch/arm/mach-ux500/platsmp.c
Simple merge

diff --cc arch/arm/mach-vexpress/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/sdhci.h
Simple merge

diff --cc arch/arm/plat-samsung/irq-vic-timer.c
Simple merge

diff --cc drivers/clk/spear/spear1340_clock.c
Simple merge

diff --cc drivers/clk/ux500/u8500_clk.c
index 9d9add1,0c9b83d..0b4f35a
--- 1/drivers/clk/ux500/u8500_clk.c
--- 2/drivers/clk/ux500/u8500_clk.c
+++ b/drivers/clk/ux500/u8500_clk.c
@@@ -319,15 -319,14 +319,15 @@@ void u8500_clk_init(u32 clkrst1_base, u
        clk_register_clkdev(clk, NULL, "gpio.7");
        clk_register_clkdev(clk, NULL, "gpioblock1");
  
-       clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", U8500_CLKRST2_BASE,
+       clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base,
                                BIT(12), 0);
  
-       clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", U8500_CLKRST3_BASE,
+       clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", clkrst3_base,
                                BIT(0), 0);
 -      clk_register_clkdev(clk, NULL, "fsmc");
 +      clk_register_clkdev(clk, "fsmc", NULL);
 +      clk_register_clkdev(clk, NULL, "smsc911x");
  
-       clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", U8500_CLKRST3_BASE,
+       clk = clk_reg_prcc_pclk("p3_pclk1", "per3clk", clkrst3_base,
                                BIT(1), 0);
        clk_register_clkdev(clk, "apb_pclk", "ssp0");
  

diff --cc drivers/clocksource/Makefile
index 4897f24,00c0862..682d48d
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -16,11 -16,12 +16,13 @@@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU)   += nom
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)     += clksrc-dbx500-prcmu.o
  obj-$(CONFIG_ARMADA_370_XP_TIMER)     += time-armada-370-xp.o
  obj-$(CONFIG_ARCH_BCM2835)    += bcm2835_timer.o
+ obj-$(CONFIG_ARCH_MARCO)      += timer-marco.o
  obj-$(CONFIG_ARCH_MXS)                += mxs_timer.o
 -obj-$(CONFIG_SUNXI_TIMER)     += sunxi_timer.o
+ obj-$(CONFIG_ARCH_PRIMA2)     += timer-prima2.o
 +obj-$(CONFIG_SUN4I_TIMER)     += sun4i_timer.o
  obj-$(CONFIG_ARCH_TEGRA)      += tegra20_timer.o
  obj-$(CONFIG_VT8500_TIMER)    += vt8500_timer.o
 +obj-$(CONFIG_ARCH_BCM)                += bcm_kona_timer.o
  
  obj-$(CONFIG_ARM_ARCH_TIMER)          += arm_arch_timer.o
  obj-$(CONFIG_CLKSRC_METAG_GENERIC)    += metag_generic.o

diff --cc drivers/crypto/ux500/cryp/cryp_core.c
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge

diff --cc drivers/pinctrl/pinctrl-sirf.c
Simple merge

diff --cc drivers/rtc/rtc-s3c.c
Simple merge

diff --cc drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
Simple merge