Merge branch 'audio-display-ti-linux-4.14.y' of git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree into ti-linux-4.14.yti-linux-4.14.y

TI-Feature: audio-display
TI-Tree: git@git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-4.14.y

* 'audio-display-ti-linux-4.14.y' of git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree:
  ARM: dts: dra71-evm: add dtb-merge support for dra71-evm boards

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8cd5040a4812..da6f62ba736e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -694,7 +694,9 @@ dtb-merge-$(CONFIG_SOC_DRA7XX) += \
         am57xx-evm-cam-ov10635.dtb \
         am57xx-evm-reva3.dtb \
         am57xx-evm-reva3-cam-mt9t111.dtb \
-        am57xx-evm-reva3-cam-ov10635.dtb
+        am57xx-evm-reva3-cam-ov10635.dtb \
+        dra71-evm-nand.dtb \
+        dra71-evm-lcd-auo-g101evn01.0.dtb
 ifeq ($(CONFIG_SOC_DRA7XX),y)
 dts-dirs += ti
 endif