Merge tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "omap device tree changes for v3.20" from Tony Lindgren:

Device tree changes for omaps. Mostly to add support for new
am437x-idk and update am437x-sk boards. Also enabling new
devices for multiple boards.

* tag 'omap-for-v3.20/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
  ARM: dts: omap3-gta04: Add handling for tv output
  ARM: dts: cm-t3x: add NAND support
  ARM: dts: am57xx-beagle-x15: Add GPIO controlled fan node
  ARM: dts: am437x-idk: add gpio-based power key
  ARM: dts: N950/N9: add twl_power
  ARM: dts: am437x-sk: add power button binding
  ARM: dts: add support for AM437x IDK
  ARM: dts: am437x-gp-evm: add VPFE device tree data
  ARM: dts: am437x-sk-evm: add VPFE device tree data
  ARM: dts: am43x-epos-evm: add VPFE device tree data
  ARM: dts: am4372: add VPFE DT node entries
  ARM: dts: DRA7X: drop id property in pcie_phy
  ARM: dts: omap3-n900: cleanup english
  ARM: dts: am57xx-beagle-x15: Add dual ethernet
  ARM: dts: am437x-sk: remove DSS pulls
  ARM: dts: am437x-sk: remove internal i2c pullups
  ARM: dts: am437x-sk: add explicit pinmux for both USB instances
  ARM: dts: am437x-sk: remove ethernet pulls
  ARM: dts: am437x-sk: add explicit MMC0 pinmux
  ARM: dts: am437x-sk: remove internal pulls from QSPI
  ...

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

diff --combined arch/arm/boot/dts/Makefile
index 8da18561d5e8bf87f6a5cce8e9981fe88ae8aeaf,1b2c7de17cf36490e740b5366acfb218df94352c..89bb76298d90d48c843c6248f79dbb86a49626ab
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -1,7 -1,5 +1,7 @@@
  ifeq ($(CONFIG_OF),y)
  
 +dtb-$(CONFIG_MACH_ASM9260) += \
 +      alphascale-asm9260-devkit.dtb
  # Keep at91 dtb files sorted alphabetically for each SoC
  # rm9200
  dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
@@@ -53,45 -51,33 +53,45 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d36ek.d
  # sama5d4
  dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d4ek.dtb
  
 -dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
 -dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
 +dtb-$(CONFIG_ARCH_ATLAS6) += \
 +      atlas6-evb.dtb
 +dtb-$(CONFIG_ARCH_ATLAS7) += \
 +      atlas7-evb.dtb
 +dtb-$(CONFIG_ARCH_AXXIA) += \
 +      axm5516-amarillo.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += \
 +      bcm2835-rpi-b.dtb \
 +      bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb
 -dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
 -dtb-$(CONFIG_ARCH_BCM_CYGNUS) += bcm911360_entphn.dtb \
 +dtb-$(CONFIG_ARCH_BCM_63XX) += \
 +      bcm963138dvt.dtb
 +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
 +      bcm911360_entphn.dtb \
        bcm911360k.dtb \
        bcm958300k.dtb
 -dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
 +dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
 +      bcm28155-ap.dtb \
        bcm21664-garnet.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
 -      berlin2-sony-nsz-gs7.dtb        \
 -      berlin2cd-google-chromecast.dtb \
 +      berlin2-sony-nsz-gs7.dtb \
 +      berlin2cd-google-chromecast.dtb \
        berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_BRCMSTB) += \
        bcm7445-bcm97445svmb.dtb
 -dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
 +dtb-$(CONFIG_ARCH_DAVINCI) += \
 +      da850-enbw-cmc.dtb \
        da850-evm.dtb
 -dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
 -dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
 -      exynos3250-rinato.dtb \
 +dtb-$(CONFIG_ARCH_EFM32) += \
 +      efm32gg-dk3750.dtb
 +dtb-$(CONFIG_ARCH_EXYNOS3) += \
 +      exynos3250-monk.dtb \
 +      exynos3250-rinato.dtb
 +dtb-$(CONFIG_ARCH_EXYNOS4) += \
        exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
@@@ -102,8 -88,7 +102,8 @@@
        exynos4412-origen.dtb \
        exynos4412-smdk4412.dtb \
        exynos4412-tiny4412.dtb \
 -      exynos4412-trats2.dtb \
 +      exynos4412-trats2.dtb
 +dtb-$(CONFIG_ARCH_EXYNOS5) += \
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
@@@ -116,27 -101,17 +116,27 @@@
        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_HIP01) += \
 +      hip01-ca9x2.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 \
@@@ -199,47 -174,37 +199,47 @@@
        kirkwood-ts219-6282.dtb \
        kirkwood-ts419-6281.dtb \
        kirkwood-ts419-6282.dtb
 -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 -dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 -dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
 -dtb-$(CONFIG_ARCH_MMP) += pxa168-aspenite.dtb \
 +dtb-$(CONFIG_ARCH_LPC32XX) += \
 +      ea3250.dtb phy3250.dtb
 +dtb-$(CONFIG_MACH_MESON6) += \
 +      meson6-atv1200.dtb
 +dtb-$(CONFIG_ARCH_MMP) += \
 +      pxa168-aspenite.dtb \
        pxa910-dkb.dtb \
        mmp2-brownstone.dtb
 -dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 -dtb-$(CONFIG_ARCH_MXC) += \
 +dtb-$(CONFIG_ARCH_MOXART) += \
 +      moxart-uc7112lx.dtb
 +dtb-$(CONFIG_SOC_IMX1) += \
        imx1-ads.dtb \
 -      imx1-apf9328.dtb \
 +      imx1-apf9328.dtb
 +dtb-$(CONFIG_SOC_IMX25) += \
        imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
        imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \
        imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
        imx25-karo-tx25.dtb \
 -      imx25-pdk.dtb \
 +      imx25-pdk.dtb
 +dtb-$(CONFIG_SOC_IMX31) += \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-eukrea-mbimxsd27-baseboard.dtb \
        imx27-pdk.dtb \
        imx27-phytec-phycore-rdk.dtb \
 -      imx27-phytec-phycard-s-rdk.dtb \
 -      imx31-bug.dtb \
 +      imx27-phytec-phycard-s-rdk.dtb
 +dtb-$(CONFIG_SOC_IMX31) += \
 +      imx31-bug.dtb
 +dtb-$(CONFIG_SOC_IMX35) += \
        imx35-eukrea-mbimxsd35-baseboard.dtb \
 -      imx35-pdk.dtb \
 -      imx50-evk.dtb \
 +      imx35-pdk.dtb
 +dtb-$(CONFIG_SOC_IMX50) += \
 +      imx50-evk.dtb
 +dtb-$(CONFIG_SOC_IMX51) += \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
        imx51-digi-connectcore-jsk.dtb \
 -      imx51-eukrea-mbimxsd51-baseboard.dtb \
 +      imx51-eukrea-mbimxsd51-baseboard.dtb
 +dtb-$(CONFIG_SOC_IMX53) += \
        imx53-ard.dtb \
        imx53-m53evk.dtb \
        imx53-mba53.dtb \
@@@ -248,8 -213,7 +248,8 @@@
        imx53-smd.dtb \
        imx53-tx53-x03x.dtb \
        imx53-tx53-x13x.dtb \
 -      imx53-voipac-bsb.dtb \
 +      imx53-voipac-bsb.dtb
 +dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-aristainetos_4.dtb \
        imx6dl-aristainetos_7.dtb \
        imx6dl-cubox-i.dtb \
@@@ -300,21 -264,16 +300,21 @@@
        imx6q-tx6q-1010-comtft.dtb \
        imx6q-tx6q-1020.dtb \
        imx6q-tx6q-1020-comtft.dtb \
 -      imx6q-tx6q-1110.dtb \
 -      imx6sl-evk.dtb \
 -      imx6sx-sdb.dtb \
 +      imx6q-tx6q-1110.dtb
 +dtb-$(CONFIG_SOC_IMX6SL) += \
 +      imx6sl-evk.dtb
 +dtb-$(CONFIG_SOC_IMX6SX) += \
 +      imx6sx-sdb.dtb
 +dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
 -      ls1021a-twr.dtb \
 +      ls1021a-twr.dtb
 +dtb-$(CONFIG_SOC_VF610) += \
        vf500-colibri-eval-v3.dtb \
        vf610-colibri-eval-v3.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
 -dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
 +dtb-$(CONFIG_ARCH_MXS) += \
 +      imx23-evk.dtb \
        imx23-olinuxino.dtb \
        imx23-stmp378x_devb.dtb \
        imx28-apf28.dtb \
@@@ -335,21 -294,17 +335,21 @@@
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
        imx28-tx28.dtb
 -dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomadik-s8815.dtb \
 +dtb-$(CONFIG_ARCH_NOMADIK) += \
 +      ste-nomadik-s8815.dtb \
        ste-nomadik-nhk15.dtb
 -dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \
 +dtb-$(CONFIG_ARCH_NSPIRE) += \
 +      nspire-cx.dtb \
        nspire-tp.dtb \
        nspire-clp.dtb
 -dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \
 +dtb-$(CONFIG_ARCH_OMAP2) += \
 +      omap2420-h4.dtb \
        omap2420-n800.dtb \
        omap2420-n810.dtb \
        omap2420-n810-wimax.dtb \
        omap2430-sdp.dtb
 -dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
 +dtb-$(CONFIG_ARCH_OMAP3) += \
 +      am3517-craneboard.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
        omap3430-sdp.dtb \
@@@ -393,8 -348,7 +393,8 @@@
        omap3-sbc-t3730.dtb \
        omap3-thunder.dtb \
        omap3-zoom3.dtb
 -dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
 +dtb-$(CONFIG_SOC_AM33XX) += \
 +      am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
        am335x-evm.dtb \
@@@ -402,8 -356,7 +402,8 @@@
        am335x-nano.dtb \
        am335x-pepper.dtb \
        am335x-lxm.dtb
 -dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
 +dtb-$(CONFIG_ARCH_OMAP4) += \
 +      omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
@@@ -411,25 -364,21 +411,26 @@@
        omap4-sdp-es23plus.dtb \
        omap4-var-dvk-om44.dtb \
        omap4-var-stk-om44.dtb
 -dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
 +dtb-$(CONFIG_SOC_AM43XX) += \
 +      am43x-epos-evm.dtb \
        am437x-sk-evm.dtb \
+       am437x-idk-evm.dtb \
        am437x-gp-evm.dtb
 -dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
 +dtb-$(CONFIG_SOC_OMAP5) += \
 +      omap5-cm-t54.dtb \
        omap5-sbc-t54.dtb \
        omap5-uevm.dtb
 -dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
 +dtb-$(CONFIG_SOC_DRA7XX) += \
 +      dra7-evm.dtb \
        am57xx-beagle-x15.dtb \
        dra72-evm.dtb
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.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_PRIMA2) += \
 +      prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
@@@ -440,21 -389,17 +441,21 @@@
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
 -dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
 +dtb-$(CONFIG_ARCH_REALVIEW) += \
 +      arm-realview-pb1176.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3066a-bqcurie2.dtb \
        rk3066a-marsboard.dtb \
        rk3188-radxarock.dtb \
        rk3288-evb-act8846.dtb \
        rk3288-evb-rk808.dtb
 -dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 -dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 +dtb-$(CONFIG_ARCH_S3C24XX) += \
 +      s3c2416-smdk2416.dtb
 +dtb-$(CONFIG_ARCH_S3C64XX) += \
 +      s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \
 +dtb-$(CONFIG_ARCH_S5PV210) += \
 +      s5pv210-aquila.dtb \
        s5pv210-goni.dtb \
        s5pv210-smdkc110.dtb \
        s5pv210-smdkv210.dtb \
@@@ -470,42 -415,34 +471,42 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += 
        sh7372-mackerel.dtb \
        sh73a0-kzm9g.dtb \
        sh73a0-kzm9g-reference.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
 +      emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
 +      r8a73a4-ape6evm.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7779-marzen.dtb \
        r8a7790-lager.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7794-alt.dtb
 -dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
 +dtb-$(CONFIG_ARCH_SOCFPGA) += \
 +      socfpga_arria5_socdk.dtb \
        socfpga_arria10_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
        socfpga_vt.dtb
 -dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
 +dtb-$(CONFIG_ARCH_SPEAR13XX) += \
 +      spear1310-evb.dtb \
        spear1340-evb.dtb
 -dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
 +dtb-$(CONFIG_ARCH_SPEAR3XX) += \
 +      spear300-evb.dtb \
        spear310-evb.dtb \
        spear320-evb.dtb \
        spear320-hmi.dtb
 -dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 +dtb-$(CONFIG_ARCH_SPEAR6XX) += \
 +      spear600-evb.dtb
 +dtb-$(CONFIG_ARCH_STI) += \
 +      stih407-b2120.dtb \
        stih410-b2120.dtb \
        stih415-b2000.dtb \
        stih415-b2020.dtb \
        stih416-b2000.dtb \
        stih416-b2020.dtb \
 -      stih416-b2020e.dtb
 +      stih416-b2020e.dtb \
 +      stih418-b2199.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-ba10-tvbox.dtb \
@@@ -541,8 -478,7 +542,8 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-a23-ippo-q8h-v5.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb
 -dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 +dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
 +      tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
@@@ -551,43 -487,34 +552,43 @@@
        tegra20-tec.dtb \
        tegra20-trimslice.dtb \
        tegra20-ventana.dtb \
 -      tegra20-whistler.dtb \
 +      tegra20-whistler.dtb
 +dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
        tegra30-apalis-eval.dtb \
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 -      tegra30-colibri-eval-v3.dtb \
 +      tegra30-colibri-eval-v3.dtb
 +dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
        tegra114-dalmore.dtb \
        tegra114-roth.dtb \
 -      tegra114-tn7.dtb \
 +      tegra114-tn7.dtb
 +dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \
        tegra124-jetson-tk1.dtb \
        tegra124-nyan-big.dtb \
        tegra124-venice2.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 -dtb-$(CONFIG_ARCH_U8500) += ste-snowball.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 \
 +dtb-$(CONFIG_ARCH_VERSATILE) += \
 +      versatile-ab.dtb \
        versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
 +dtb-$(CONFIG_ARCH_VEXPRESS) += \
 +      vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \
        vexpress-v2p-ca15_a7.dtb
 -dtb-$(CONFIG_ARCH_VIRT) += xenvm-4.2.dtb
 -dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
 +dtb-$(CONFIG_ARCH_VIRT) += \
 +      xenvm-4.2.dtb
 +dtb-$(CONFIG_ARCH_VT8500) += \
 +      vt8500-bv07.dtb \
        wm8505-ref.dtb \
        wm8650-mid.dtb \
        wm8750-apc8750.dtb \
@@@ -608,10 -535,8 +609,10 @@@ dtb-$(CONFIG_MACH_ARMADA_370) += 
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
 -      armada-385-db.dtb \
 -      armada-385-rd.dtb
 +      armada-385-db-ap.dtb \
 +      armada-388-db.dtb \
 +      armada-388-gp.dtb \
 +      armada-388-rd.dtb
  dtb-$(CONFIG_MACH_ARMADA_XP) += \
        armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
@@@ -621,18 -546,17 +622,18 @@@
        armada-xp-netgear-rn2120.dtb \
        armada-xp-openblocks-ax3-4.dtb \
        armada-xp-synology-ds414.dtb
 -dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
 +dtb-$(CONFIG_MACH_DOVE) += \
 +      dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-cubox-es.dtb \
        dove-d2plug.dtb \
        dove-d3plug.dtb \
        dove-dove-db.dtb
 -dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb \
 +dtb-$(CONFIG_ARCH_MEDIATEK) += \
 +      mt6589-aquaris5.dtb \
        mt6592-evb.dtb \
        mt8127-moose.dtb \
        mt8135-evbp1.dtb
 -
  endif
  
  always                := $(dtb-y)