From 361a7d10dc37120b6b4fd74cd5362207c45cdca5 Mon Sep 17 00:00:00 2001
From: Lokesh Vutla <lokeshvutla@ti.com>
Date: Tue, 12 May 2020 18:12:00 +0530
Subject: [PATCH] arm: dts: ti: am57x-idk: Enable support for building pps dtb

commit fe7d00069a023 ("arm: dts: ti: dt-overlay: Add a pps overlay
for am57xx idk platforms") added support for building overlays. But
missed creating dtbs using dtb-merge.cfg

Update Makefile and dtb-merge.cfg to build all am57x-idk dtbs specific
to pps.

Fixes: fe7d00069a023 ("arm: dts: ti: dt-overlay: Add a pps overlay for am57xx idk platforms")
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 arch/arm/boot/dts/Makefile         | 3 +++
 arch/arm/boot/dts/ti/dtb-merge.cfg | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 06ead86907072..0615a978e36dc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -815,9 +815,12 @@ dtb-merge-$(CONFIG_SOC_DRA7XX) += \
 	am57xx-evm-reva3-cam-ov10635.dtb \
 	am571x-idk-lcd-osd101t2045.dtb \
 	am571x-idk-lcd-osd101t2587.dtb \
+	am571x-idk-pps.dtb \
 	am572x-idk-lcd-osd101t2045.dtb \
 	am572x-idk-lcd-osd101t2587.dtb \
+	am572x-idk-pps.dtb \
 	am574x-idk-lcd-osd101t2587.dtb \
+	am574x-idk-pps.dtb \
 	dra71-evm-nand.dtb \
 	dra71-evm-lcd-auo-g101evn01.0.dtb \
 	dra72-evm-lcd-osd101t2045.dtb \
diff --git a/arch/arm/boot/dts/ti/dtb-merge.cfg b/arch/arm/boot/dts/ti/dtb-merge.cfg
index 2370b0ae1d469..1c77610d2fbd8 100644
--- a/arch/arm/boot/dts/ti/dtb-merge.cfg
+++ b/arch/arm/boot/dts/ti/dtb-merge.cfg
@@ -5,11 +5,14 @@ am57xx-evm-reva3-cam-ov10635: am57xx-beagle-x15-revc.dtb am57xx-evm-common.dtbo
 
 am571x-idk-lcd-osd101t2045: am571x-idk.dtb am57xx-idk-osd-lcd-common.dtbo am571x-idk-touchscreen.dtbo lcd-osd101t2045.dtbo
 am571x-idk-lcd-osd101t2587: am571x-idk.dtb am57xx-idk-osd-lcd-common.dtbo am571x-idk-touchscreen.dtbo lcd-osd101t2587.dtbo
+am571x-idk-pps: am571x-idk.dtb am57xx-idk-pps.dtbo
 
 am572x-idk-lcd-osd101t2045: am572x-idk.dtb am57xx-idk-osd-lcd-common.dtbo am572x-idk-touchscreen.dtbo lcd-osd101t2045.dtbo
 am572x-idk-lcd-osd101t2587: am572x-idk.dtb am57xx-idk-osd-lcd-common.dtbo am572x-idk-touchscreen.dtbo lcd-osd101t2587.dtbo
+am572x-idk-pps: am572x-idk.dtb am57xx-idk-pps.dtbo
 
 am574x-idk-lcd-osd101t2587: am574x-idk.dtb am57xx-idk-osd-lcd-common.dtbo am572x-idk-touchscreen.dtbo lcd-osd101t2587.dtbo
+am574x-idk-pps: am574x-idk.dtb am57xx-idk-pps.dtbo
 
 dra71-evm-nand: dra71-evm.dtb dra71-evm-nand.dtbo
 dra71-evm-lcd-auo-g101evn01.0: dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtbo
-- 
GitLab