Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC-specific updates from Arnd Bergmann:
 "This is a larger set of new functionality for the existing SoC
  families, including:

   - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
     wm8850

   - prima2 gains support for the "marco" SoC family, its SMP based
     cousin

   - tegra gains support for the new Tegra4 (Tegra114) family

   - socfpga now supports a newer version of the hardware including SMP

   - i.mx31 and bcm2835 are now using DT probing for their clocks

   - lots of updates for sh-mobile

   - OMAP updates for clocks, power management and USB

   - i.mx6q and tegra now support cpuidle

   - kirkwood now supports PCIe hot plugging

   - tegra clock support is updated

   - tegra USB PHY probing gets implemented diffently"

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
  ARM: prima2: remove duplicate v7_invalidate_l1
  ARM: shmobile: r8a7779: Correct TMU clock support again
  ARM: prima2: fix __init section for cpu hotplug
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
  ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
  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
  ...

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/clk-imx27.c
Simple merge

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

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-omap2/board-overo.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/omap_hwmod_44xx_data.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/usb-musb.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/board-armadillo800eva.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
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-tegra/cpu-tegra.c
Simple merge

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

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

diff --cc drivers/clk/Makefile
index 14fde73ea6ff9f662fe11999f6b0d01632c5f7e9,f0b269a2058d579c71317ea145a633351fb2b852..300d4775d9268334d30aeb1b6d8d7d8070de634b
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -25,9 -20,10 +25,11 @@@ endi
  obj-$(CONFIG_MACH_LOONGSON1)  += clk-ls1x.o
  obj-$(CONFIG_ARCH_U8500)      += ux500/
  obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
 -obj-$(CONFIG_ARCH_SUNXI)      += clk-sunxi.o
  obj-$(CONFIG_ARCH_ZYNQ)               += clk-zynq.o
+ obj-$(CONFIG_ARCH_TEGRA)      += tegra/
+ 
 +obj-$(CONFIG_X86)             += x86/
 +
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
  obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o

diff --cc drivers/clk/mxs/clk-imx28.c
Simple merge

diff --cc drivers/dma/tegra20-apb-dma.c
Simple merge

diff --cc drivers/gpu/drm/tegra/dc.c
Simple merge

diff --cc drivers/gpu/drm/tegra/hdmi.c
Simple merge

diff --cc drivers/i2c/busses/i2c-tegra.c
Simple merge

diff --cc drivers/input/keyboard/tegra-kbc.c
index d89e7d392d1ef38131a45e832f0e7596aa77cf68,54ac1dc7d477b4cdcb22e2188233a2ae6b79c01f..0e138ebcc768768e4b57b4aa0e50eb097b5f3d06
--- 1/drivers/input/keyboard/tegra-kbc.c
--- 2/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@@ -29,16 -29,9 +29,16 @@@
  #include <linux/of.h>
  #include <linux/clk.h>
  #include <linux/slab.h>
 -#include <linux/input/tegra_kbc.h>
 +#include <linux/input/matrix_keypad.h>
- #include <mach/clk.h>
+ #include <linux/clk/tegra.h>
  
 +#define KBC_MAX_GPIO  24
 +#define KBC_MAX_KPENT 8
 +
 +#define KBC_MAX_ROW   16
 +#define KBC_MAX_COL   8
 +#define KBC_MAX_KEY   (KBC_MAX_ROW * KBC_MAX_COL)
 +
  #define KBC_MAX_DEBOUNCE_CNT  0x3ffu
  
  /* KBC row scan time and delay for beginning the row scan. */

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/spi/spi-tegra20-sflash.c
Simple merge

diff --cc drivers/spi/spi-tegra20-slink.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge

diff --cc sound/soc/tegra/tegra30_ahub.c
Simple merge