Merge branch 'next/soc' into next/dt

diff --combined arch/arm/Kconfig
index 42ee64e68c438a57a4ac3d5557b73c8528bc61f6,22bfac3e69757481f7212080027d5aecc4a13063..b70ee954f69fb4d0038c585268fe6a9f099537fb
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -393,6 -393,7 +393,7 @@@ config ARCH_GEMIN
  config ARCH_SIRF
        bool "CSR SiRF"
        select ARCH_REQUIRE_GPIOLIB
+       select AUTO_ZRELADDR
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP
@@@ -642,6 -643,7 +643,7 @@@ config ARCH_TEGR
        select ARCH_HAS_CPUFREQ
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+       select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
@@@ -899,12 -901,10 +901,12 @@@ config ARCH_NOMADI
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC
 +      select CLKSRC_NOMADIK_MTU
        select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_CACHE_L2X0
 +      select USE_OF
        select PINCTRL
        select PINCTRL_STN8815
        select SPARSE_IRQ
@@@ -951,22 -951,6 +953,6 @@@ config ARCH_OMA
        help
          Support for TI's OMAP platform (OMAP1/2/3/4).
  
- config ARCH_VT8500_SINGLE
-       bool "VIA/WonderMedia 85xx"
-       select ARCH_HAS_CPUFREQ
-       select ARCH_REQUIRE_GPIOLIB
-       select CLKDEV_LOOKUP
-       select COMMON_CLK
-       select CPU_ARM926T
-       select GENERIC_CLOCKEVENTS
-       select GENERIC_GPIO
-       select HAVE_CLK
-       select MULTI_IRQ_HANDLER
-       select SPARSE_IRQ
-       select USE_OF
-       help
-         Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
- 
  endchoice
  
  menu "Multiple platform selection"

diff --combined arch/arm/boot/dts/Makefile
index 3d115dcb3461cfd860ea3fb5f26c3384a52d1013,2e7a7e2de11a5ab0272c6f7ec27b7f30b18878b1..ca683a66b498c4e6fe0c78e2542f05c2a2a63f89
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -73,6 -73,7 +73,7 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ts219-6281.dtb \
        kirkwood-ts219-6282.dtb \
        kirkwood-openblocks_a6.dtb
+ dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
@@@ -100,7 -101,6 +101,7 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
        imx28-tx28.dtb
 +dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb
  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
        omap3-beagle.dtb \
        omap3-beagle-xm.dtb \
@@@ -144,7 -144,9 +145,9 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
        tegra20-ventana.dtb \
        tegra20-whistler.dtb \
        tegra30-cardhu-a02.dtb \
-       tegra30-cardhu-a04.dtb
+       tegra30-cardhu-a04.dtb \
+       tegra114-dalmore.dtb \
+       tegra114-pluto.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \
@@@ -152,7 -154,8 +155,8 @@@
        xenvm-4.2.dtb
  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
        wm8505-ref.dtb \
-       wm8650-mid.dtb
+       wm8650-mid.dtb \
+       wm8850-w70v2.dtb
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
  
  targets += dtbs