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

diff --combined arch/arm/boot/dts/Makefile
index 8ca997346a969967090b9bfbc3fc19e09455e049,b2a8b96c497960b1ac6adbaa528c7c1aa69aa4e2..dc38fc1057f37bd54f224433355618820acde473
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -51,13 -51,13 +51,13 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d36ek.d
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
        bcm21664-garnet.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb        \
 -      berlin2cd-google-chromecast.dtb
 +      berlin2cd-google-chromecast.dtb \
 +      berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
@@@ -128,6 -128,9 +128,9 @@@ kirkwood := 
        kirkwood-nsa310a.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
+       kirkwood-openrd-base.dtb \
+       kirkwood-openrd-client.dtb \
+       kirkwood-openrd-ultimate.dtb \
        kirkwood-rd88f6192.dtb \
        kirkwood-rd88f6281-a0.dtb \
        kirkwood-rd88f6281-a1.dtb \
@@@ -158,12 -161,10 +161,12 @@@ dtb-$(CONFIG_ARCH_MXC) += 
        imx27-phytec-phycard-s-rdk.dtb \
        imx31-bug.dtb \
        imx35-eukrea-mbimxsd35-baseboard.dtb \
 +      imx35-pdk.dtb \
        imx50-evk.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
 +      imx51-digi-connectcore-jsk.dtb \
        imx51-eukrea-mbimxsd51-baseboard.dtb \
        imx53-ard.dtb \
        imx53-m53evk.dtb \
@@@ -182,8 -183,6 +185,8 @@@
        imx6dl-gw54xx.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
 +      imx6dl-phytec-pbab01.dtb \
 +      imx6dl-riotboard.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
@@@ -208,7 -207,6 +211,7 @@@
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
 +      vf610-colibri.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
@@@ -251,7 -249,6 +254,7 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-sbc-t3730.dtb \
        omap3-devkit8000.dtb \
        omap3-beagle-xm.dtb \
 +      omap3-beagle-xm-ab.dtb \
        omap3-evm.dtb \
        omap3-evm-37xx.dtb \
        omap3-ldp.dtb \
@@@ -303,10 -300,18 +306,10 @@@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb
  dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-apq8074-dragonboard.dtb
 -dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 -      ste-hrefprev60-stuib.dtb \
 -      ste-hrefprev60-tvk.dtb \
 -      ste-hrefv60plus-stuib.dtb \
 -      ste-hrefv60plus-tvk.dtb \
 -      ste-ccu8540.dtb \
 -      ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 -      r7s72100-genmai.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
        r7s72100-genmai-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
@@@ -323,13 -328,11 +326,13 @@@
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai-reference.dtb \
 +      r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
 +      socfpga_cyclone5_socrates.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
@@@ -372,16 -375,9 +375,16 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
        tegra30-cardhu-a04.dtb \
        tegra114-dalmore.dtb \
        tegra124-venice2.dtb
 +dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 +dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 +      ste-hrefprev60-stuib.dtb \
 +      ste-hrefprev60-tvk.dtb \
 +      ste-hrefv60plus-stuib.dtb \
 +      ste-hrefv60plus-tvk.dtb \
 +      ste-ccu8540.dtb \
 +      ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \

diff --combined arch/arm/mach-mvebu/Kconfig
index 199187e474ce524600922a4d46fd5c41a537711d,4f3644127614a3779a3592cc29afaeb5e205322e..80e01b3c8c9c68c720b59bc3ee7005d8e61f89b2
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,6 -3,7 +3,6 @@@ 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
@@@ -11,6 -12,7 +11,6 @@@
        select ARCH_REQUIRE_GPIOLIB
        select MIGHT_HAVE_PCI
        select PCI_QUIRKS if PCI
 -      select OF_ADDRESS_PCI
  
  if ARCH_MVEBU
  
@@@ -37,11 -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.
@@@ -52,11 -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.
@@@ -89,11 -95,13 +91,11 @@@ config MACH_KIRKWOO
        select ARCH_REQUIRE_GPIOLIB
        select CPU_FEROCEON
        select KIRKWOOD_CLK
 -      select OF_IRQ
        select ORION_IRQCHIP
        select ORION_TIMER
        select PCI
        select PCI_QUIRKS
        select PINCTRL_KIRKWOOD
 -      select USE_OF
        help
          Say 'Y' here if you want your kernel to support boards based
          on the Marvell Kirkwood device tree.