Merge branch 'mvebu/soc-orion5x' into next/dt

Merging in a local copy from the next/soc branch to avoid some annoying
context conflicts in the dts Makefile.

* mvebu/soc-orion5x: (29 commits)
  ARM: orion: remove no longer needed gpio DT code
  ARM: orion: remove no longer needed DT IRQ code
  ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree
  ARM: orion5x: convert d2net to Device Tree
  ARM: orion5x: convert RD-88F5182 to Device Tree
  ARM: orion5x: remove unneeded code for edmini_v2
  ARM: orion5x: keep TODO list in edmini_v2 DT
  ARM: orion5x: use DT to describe NOR on edmini_v2
  ARM: orion5x: use DT to describe EHCI on edmini_v2
  ARM: orion5x: use DT to describe I2C devices on edmini_v2
  ARM: orion5x: convert edmini_v2 to DT pinctrl
  ARM: orion5x: add standard pinctrl configs for sata0 and sata1
  ARM: orion5x: add Device Bus description at SoC level
  ARM: orion5x: update I2C description at SoC level
  ARM: orion5x: enable pinctrl driver at SoC level
  ARM: orion5x: switch to DT interrupts and timer
  ARM: orion: switch to a per-platform handle_irq() function
  ARM: orion5x: convert to use 'clocks' property for UART controllers
  ARM: orion5x: switch to use the clock driver for DT platforms
  ARM: orion5x: add interrupt for Ethernet in Device Tree
  ...

diff --combined arch/arm/boot/dts/Makefile
index 881c8c47681d9e71709097cf533767eecaf850a2,629eee22e606a96d09a988122b65a20f32cc09a5..37e979f15f89303646591a2e572c36d177a32732
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -51,9 -51,10 +51,9 @@@ 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
@@@ -73,7 -74,6 +73,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
        exynos5420-arndale-octa.dtb \
 +      exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb
@@@ -128,9 -128,6 +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 \
@@@ -161,12 -158,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 \
@@@ -185,8 -180,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 \
@@@ -211,7 -204,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 \
@@@ -254,7 -246,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 \
@@@ -298,11 -289,21 +298,14 @@@
        am43x-epos-evm.dtb \
        am437x-gp-evm.dtb \
        dra7-evm.dtb
- dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
+ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
+       orion5x-lacie-ethernet-disk-mini-v2.dtb \
+       orion5x-maxtor-shared-storage-2.dtb \
+       orion5x-rd88f5182-nas.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  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
@@@ -324,13 -325,11 +327,13 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += e
        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
@@@ -339,33 -338,24 +342,33 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \
 -      stih416-b2000.dtb \
 +dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 +      stih415-b2000.dtb \
        stih415-b2020.dtb \
 -      stih416-b2020.dtb
 -dtb-$(CONFIG_ARCH_SUNXI) += \
 +      stih416-b2000.dtb \
 +      stih416-b2020.dtb \
 +      stih416-b2020-revE.dtb
 +dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
        sun4i-a10-inet97fv2.dtb \
        sun4i-a10-olinuxino-lime.dtb \
 -      sun4i-a10-pcduino.dtb \
 +      sun4i-a10-pcduino.dtb
 +dtb-$(CONFIG_MACH_SUN5I) += \
        sun5i-a10s-olinuxino-micro.dtb \
 +      sun5i-a10s-r7-tv-dongle.dtb \
        sun5i-a13-olinuxino.dtb \
 -      sun5i-a13-olinuxino-micro.dtb \
 +      sun5i-a13-olinuxino-micro.dtb
 +dtb-$(CONFIG_MACH_SUN6I) += \
 +      sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
 +      sun6i-a31-m9.dtb
 +dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
 +      sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-olinuxino-micro.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -380,22 -370,11 +383,22 @@@
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 +      tegra30-colibri-eval-v3.dtb \
        tegra114-dalmore.dtb \
 +      tegra114-roth.dtb \
 +      tegra114-tn7.dtb \
 +      tegra124-jetson-tk1.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 \