Merge branch 'next/soc' into for-next

* next/soc: (145 commits)
  ARM: shmobile: r8a7779: Correct TMU clock support again
  ARM: prima2: fix __init section for cpu hotplug
  arm: socfpga: Add SMP support for actual socfpga harware
  arm: Add v7_invalidate_l1 to cache-v7.S
  arm: socfpga: Add entries to enable make dtbs socfpga
  arm: socfpga: Add new device tree source for actual socfpga HW
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
  ARM: tegra: Fix build error for gic update
  ARM: tegra: remove empty tegra_smp_init_cpus()
  ARM: shmobile: Register ARM architected timer
  ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
  ARM: shmobile: r8a7779: Correct TMU clock support
  ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
  ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
  ARM: mxs: use apbx bus clock to drive the timers on timrotv2
  ARM: mxs: Update mxs_defconfig
  ARM: imx_v6_v7_defconfig: enable anatop regulator and snvs rtc
  ARM: imx: support DEBUG_LL uart port selection for all i.MX SoCs
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/include/asm/smp_scu.h
index 86dff32a073755f46c40c379d27a29f9aab5b829,006f02681cd8e240738efb823cc904d16abaea6e..18d1693736124a75205c765b5e5f588663f3b95f
--- 1/arch/arm/include/asm/smp_scu.h
--- 2/arch/arm/include/asm/smp_scu.h
+++ b/arch/arm/include/asm/smp_scu.h
@@@ -6,15 -6,26 +6,32 @@@
  #define SCU_PM_POWEROFF       3
  
  #ifndef __ASSEMBLER__
+ 
+ #include <asm/cputype.h>
+ 
+ static inline bool scu_a9_has_base(void)
+ {
+       return read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9;
+ }
+ 
+ static inline unsigned long scu_a9_get_base(void)
+ {
+       unsigned long pa;
+ 
+       asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (pa));
+ 
+       return pa;
+ }
+ 
  unsigned int scu_get_core_count(void __iomem *);
 -void scu_enable(void __iomem *);
  int scu_power_mode(void __iomem *, unsigned int);
 +
 +#ifdef CONFIG_SMP
 +void scu_enable(void __iomem *scu_base);
 +#else
 +static inline void scu_enable(void __iomem *scu_base) {}
 +#endif
 +
  #endif
  
  #endif

diff --cc arch/arm/mach-bcm2835/bcm2835.c
Simple merge

diff --cc arch/arm/mach-imx/imx31-dt.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/dma.c
Simple merge

diff --cc arch/arm/mach-omap2/drm.c
Simple merge

diff --cc arch/arm/mach-omap2/gpio.c
Simple merge

diff --cc arch/arm/mach-omap2/gpmc.c
Simple merge

diff --cc arch/arm/mach-omap2/hdq1w.c
Simple merge

diff --cc arch/arm/mach-omap2/hwspinlock.c
Simple merge

diff --cc arch/arm/mach-omap2/i2c.c
Simple merge

diff --cc arch/arm/mach-omap2/mcbsp.c
Simple merge

diff --cc arch/arm/mach-omap2/omap-iommu.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_device.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/pm-debug.c
Simple merge

diff --cc arch/arm/mach-omap2/pm.c
Simple merge

diff --cc arch/arm/mach-omap2/pmu.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-omap2/wd_timer.c
Simple merge

diff --cc arch/arm/mach-prima2/include/mach/uncompress.h
Simple merge

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

diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
Simple merge

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

diff --cc arch/arm/mach-vt8500/vt8500.c
Simple merge