Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
	arch/arm/mach-mvebu/Kconfig

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-mvebu/Kconfig
index bfc5af18e4839acf13cf4fd88030bfbb378b1215,4f3644127614a3779a3592cc29afaeb5e205322e..80e01b3c8c9c68c720b59bc3ee7005d8e61f89b2
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,8 -3,10 +3,9 @@@ config ARCH_MVEB
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
 -      select IRQ_DOMAIN
        select PINCTRL
        select PLAT_ORION
+       select SOC_BUS
        select MVEBU_MBUS
        select ZONE_DMA if ARM_LPAE
        select ARCH_REQUIRE_GPIOLIB
@@@ -36,8 -39,13 +37,12 @@@ config MACH_ARMADA_37
        select ARM_ERRATA_753970
        select ARM_GIC
        select ARMADA_375_CLK
 -      select CPU_V7
+       select HAVE_ARM_SCU
+       select HAVE_ARM_TWD if SMP
+       select HAVE_SMP
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_375
+       select USB_ARCH_HAS_XHCI
        help
          Say 'Y' here if you want your kernel to support boards based
          on the Marvell Armada 375 SoC with device tree.
@@@ -48,8 -56,13 +53,12 @@@ config MACH_ARMADA_38
        select ARM_ERRATA_753970
        select ARM_GIC
        select ARMADA_38X_CLK
 -      select CPU_V7
+       select HAVE_ARM_SCU
+       select HAVE_ARM_TWD if SMP
+       select HAVE_SMP
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_38X
+       select USB_ARCH_HAS_XHCI
        help
          Say 'Y' here if you want your kernel to support boards based
          on the Marvell Armada 380/385 SoC with device tree.

diff --cc drivers/irqchip/irq-armada-370-xp.c
Simple merge