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,d6b0a772a6dd2e94cbb4d82b0e281672ba8d46fb..199187e474ce524600922a4d46fd5c41a537711d
--- 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,6 -39,10 +37,9 @@@ 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
        help
@@@ -48,6 -55,10 +52,9 @@@ 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
        help

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