Merge tag 'gpio-v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / arch / arm / boot / dts / Makefile

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f1cc5b3..233159d 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -335,6 +335,8 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
        imx6sx-sabreauto.dtb \
        imx6sx-sdb-reva.dtb \
        imx6sx-sdb.dtb
+dtb-$(CONFIG_SOC_IMX6UL) += \
+       imx6ul-14x14-evk.dtb
 dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-sdb.dtb
 dtb-$(CONFIG_SOC_LS1021A) += \
@@ -394,6 +396,8 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
        omap3-cm-t3530.dtb \
        omap3-cm-t3730.dtb \
        omap3-devkit8000.dtb \
+       omap3-devkit8000-lcd43.dtb \
+       omap3-devkit8000-lcd70.dtb \
        omap3-evm.dtb \
        omap3-evm-37xx.dtb \
        omap3-gta04a3.dtb \
@@ -476,6 +480,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
        orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
        orion5x-linkstation-lswtgl.dtb \
+       orion5x-lswsgl.dtb \
        orion5x-maxtor-shared-storage-2.dtb \
        orion5x-rd88f5182-nas.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += \
@@ -503,7 +508,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3288-firefly.dtb \
        rk3288-r89.dtb \
        rk3288-veyron-jerry.dtb \
-       rk3288-veyron-pinky.dtb
+       rk3288-veyron-minnie.dtb \
+       rk3288-veyron-pinky.dtb \
+       rk3288-veyron-speedy.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += \
        s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += \
@@ -516,11 +523,8 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
        s5pv210-smdkv210.dtb \
        s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
-       r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
-       r8a7778-bockw-reference.dtb \
-       r8a7779-marzen.dtb \
-       sh73a0-kzm9g.dtb
+       r8a7778-bockw-reference.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
@@ -533,6 +537,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        r8a7791-koelsch.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
+       r8a7794-silk.dtb \
        sh73a0-kzm9g.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
@@ -663,10 +668,11 @@ dtb-$(CONFIG_ARCH_U8500) += \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_UNIPHIER) += \
-       uniphier-ph1-sld3-ref.dtb \
        uniphier-ph1-ld4-ref.dtb \
+       uniphier-ph1-ld6b-ref.dtb \
        uniphier-ph1-pro4-ref.dtb \
-       uniphier-ph1-sld8-ref.dtb
+       uniphier-ph1-sld3-ref.dtb \
+       uniphier-ph1-sld8-ref.dtb 
 dtb-$(CONFIG_ARCH_VERSATILE) += \
        versatile-ab.dtb \
        versatile-pb.dtb