Merge tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu: dt for v3.20" from Andrew Lunn:

mvebu dt changes for v3.20 (part #1)

- Add Armada 388 General Purpose Development Board support
- Add Device Tree description of the Armada 388 SoC
- Document the Device Tree binding for the Armada 388 SoC
- a38x: Add missing labels
- a38x: Add more pinctrl functions
- Add Armada 385 Access Point Development Board support
- Add a number of pinctrl functions
- A38x: Remove redundant pinctrl informations
- a38x: Fix node names
- Add support for Seagate BlackArmor NAS220
- kirkwood: enable phy driver for SATA controller on 88f6192
- gpio_poweroff support for Iomega ix2-200
- Use all remaining MTD space foor rootfs of Iomega ix2-200

* tag 'mvebu-dt-3.20' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Add Armada 388 General Purpose Development Board support
  ARM: mvebu: Add Device Tree description of the Armada 388 SoC
  ARM: mvebu: Document the Device Tree binding for the Armada 388 SoC
  ARM: mvebu: a38x: Add missing labels
  ARM: mvebu: a38x: Add more pinctrl functions
  ARM: mvebu: Add Armada 385 Access Point Development Board support
  ARM: mvebu: Add a number of pinctrl functions
  ARM: mvebu: A38x: Remove redundant pinctrl informations
  ARM: mvebu: a38x: Fix node names
  Kirkwood: add support for Seagate BlackArmor NAS220
  ARM: dts: kirkwood: enable phy driver for SATA controller on 88f6192
  ARM: dts: add gpio_poweroff support for Iomega ix2-200
  ARM: dts: use all remaining MTD space foor rootfs of Iomega ix2-200

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
index 1e626f6d45c979ce81c01a0860cc4d407f0274b8,17ee1d6a0ac02de75e386926661b4928ff06cf8f..43ae1918c1f58509bc0ac0d5d9ba48cc1d71f4c8
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -112,24 -101,18 +112,25 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
 -dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
 -dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
 -dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
 +dtb-$(CONFIG_ARCH_HI3xxx) += \
 +      hi3620-hi4511.dtb
 +dtb-$(CONFIG_ARCH_HIX5HD2) += \
 +      hisi-x5hd2-dkb.dtb
 +dtb-$(CONFIG_ARCH_HIGHBANK) += \
 +      highbank.dtb \
        ecx-2000.dtb
 -dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
 -dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
 +dtb-$(CONFIG_ARCH_HIP04) += \
 +      hip04-d01.dtb
 +dtb-$(CONFIG_ARCH_INTEGRATOR) += \
 +      integratorap.dtb \
        integratorcp.dtb
 -dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
 +dtb-$(CONFIG_ARCH_KEYSTONE) += \
 +      k2hk-evm.dtb \
        k2l-evm.dtb \
        k2e-evm.dtb
 -dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
 +dtb-$(CONFIG_MACH_KIRKWOOD) += \
 +      kirkwood-b3.dtb \
+       kirkwood-blackarmor-nas220.dtb \
        kirkwood-cloudbox.dtb \
        kirkwood-d2net.dtb \
        kirkwood-db-88f6281.dtb \