From 09329db8e8bc5fe807e18fb04025f339e40e240e Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahsha@qti.qualcomm.com>
Date: Fri, 13 May 2022 20:47:56 +0530
Subject: [PATCH] ARM: dts: msm: fix board id and dtbo issue for SA8155

correct the board id for SA8155 platform dtbo and
fix the issue with multiple dtbo generation issue.

Change-Id: I44d4fa7b44c554755729d19526caa714e08b774f
---
 Kbuild                              |  3 +--
 display/sa8155-adp-star-display.dts |  2 +-
 display/sm8150-sde.dts              | 12 ------------
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 display/sm8150-sde.dts

diff --git a/Kbuild b/Kbuild
index 7702c635..5e0a7e4c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -17,8 +17,7 @@ dtbo-$(CONFIG_ARCH_KALAMA) += display/trustedvm-kalama-sde-display-mtp-overlay.d
 endif
 
 ifeq ($(CONFIG_ARCH_SA8155), y)
-dtbo-y += display/sm8150-sde.dtbo \
-          display/sa8155-adp-star-display.dtbo
+dtbo-y += display/sa8155-adp-star-display.dtbo
 endif
 
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
diff --git a/display/sa8155-adp-star-display.dts b/display/sa8155-adp-star-display.dts
index 2bbf011a..ddea3bd6 100644
--- a/display/sa8155-adp-star-display.dts
+++ b/display/sa8155-adp-star-display.dts
@@ -6,7 +6,7 @@
 / {
 	model = "ADP-AIR";
 	compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155", "qcom,adp-air";
-	qcom,board-id = <0X01000019 0>;
+	qcom,board-id = <0 0>;
 	qcom,msm-id = <339 0x10000>, <339 0x20000>,
 			<362 0x10000>, <362 0x20000>,
 			<367 0x10000>, <367 0x20000>;
diff --git a/display/sm8150-sde.dts b/display/sm8150-sde.dts
deleted file mode 100644
index a1cf1f7e..00000000
--- a/display/sm8150-sde.dts
+++ /dev/null
@@ -1,12 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "sm8150-sde.dtsi"
-#include "sm8150-sde-pll.dtsi"
-
-/ {
-	qcom,msm-id = <339 0x10000>, <339 0x20000>,
-			<362 0x10000>, <362 0x20000>,
-			<367 0x10000>, <367 0x20000>;
-	qcom,board-id = <0 0>;
-};