From e35871b272b3ba5bfa3e452443a44600b39a16d5 Mon Sep 17 00:00:00 2001
From: Rohit Agarwal <rohiagar@qti.qualcomm.com>
Date: Wed, 20 Jul 2022 14:43:06 +0530
Subject: [PATCH 1/2] Revert "ARM: dts: msm: Add board files for SDXPINN
 target"

This reverts commit b600ef38646bedd96c534f2f13baf05483715976.
As these boards are not there for sdxpinn.

Change-Id: I6a4e467328b9b2a5723273c37484e2ca3acf22da
---
 bindings/arm/msm/msm.txt |  2 --
 qcom/Makefile            |  4 ----
 qcom/sdxpinn-cdp.dts     | 11 -----------
 qcom/sdxpinn-cdp.dtsi    |  2 --
 qcom/sdxpinn-mtp.dts     | 11 -----------
 qcom/sdxpinn-mtp.dtsi    |  2 --
 6 files changed, 32 deletions(-)
 delete mode 100644 qcom/sdxpinn-cdp.dts
 delete mode 100644 qcom/sdxpinn-cdp.dtsi
 delete mode 100644 qcom/sdxpinn-mtp.dts
 delete mode 100644 qcom/sdxpinn-mtp.dtsi

diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt
index e37c3714..c68dc399 100644
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -315,8 +315,6 @@ compatible = "qcom,khaje-idp"
 compatible = "qcom,khaje-qrd"
 compatible = "qcom,khaje-atp"
 compatible = "qcom,sdxpinn-rumi"
-compatible = "qcom,sdxpinn-mtp"
-compatible = "qcom,sdxpinn-cdp"
 compatible = "qcom,sa410m-rumi"
 compatible = "qcom,quinvm"
 compatible = "qcom,sdxbaagha-rumi"
diff --git a/qcom/Makefile b/qcom/Makefile
index 247431d9..b62c07f5 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -169,10 +169,6 @@ gen4auto-overlays-dtb-$(CONFIG_ARCH_LEMANS) +=  \
 
 dtb-y += $(gen4auto-dtb-y)
 
-sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb \
-                 sdxpinn-mtp.dtb \
-                 sdxpinn-cdp.dtb
-
 sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb
 dtb-y += $(sdxpinn-dtb-y)
 
diff --git a/qcom/sdxpinn-cdp.dts b/qcom/sdxpinn-cdp.dts
deleted file mode 100644
index 8a380b0b..00000000
--- a/qcom/sdxpinn-cdp.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-
-#include "sdxpinn.dtsi"
-#include "sdxpinn-cdp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. SDXPINN CDP";
-	compatible = "qcom,sdxpinn-cdp",
-		"qcom,sdxpinn", "qcom,cdp";
-	qcom,board-id = <0x10001 0x0>;
-};
diff --git a/qcom/sdxpinn-cdp.dtsi b/qcom/sdxpinn-cdp.dtsi
deleted file mode 100644
index 17f1e228..00000000
--- a/qcom/sdxpinn-cdp.dtsi
+++ /dev/null
@@ -1,2 +0,0 @@
-&soc {
-};
diff --git a/qcom/sdxpinn-mtp.dts b/qcom/sdxpinn-mtp.dts
deleted file mode 100644
index 674bfe95..00000000
--- a/qcom/sdxpinn-mtp.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-
-#include "sdxpinn.dtsi"
-#include "sdxpinn-mtp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. SDXPINN MTP";
-	compatible = "qcom,sdxpinn-mtp",
-		"qcom,sdxpinn", "qcom,mtp";
-	qcom,board-id = <0x10008 0x0>;
-};
diff --git a/qcom/sdxpinn-mtp.dtsi b/qcom/sdxpinn-mtp.dtsi
deleted file mode 100644
index 17f1e228..00000000
--- a/qcom/sdxpinn-mtp.dtsi
+++ /dev/null
@@ -1,2 +0,0 @@
-&soc {
-};

From 77d4c0c221f91d9938e0e310349133bd7aabdd4d Mon Sep 17 00:00:00 2001
From: Rohit Agarwal <rohiagar@qti.qualcomm.com>
Date: Wed, 20 Jul 2022 15:23:59 +0530
Subject: [PATCH 2/2] ARM: dts: qcom: Add additional board files for sdxpinn

Add additional support board files found on sdxpinn.

Change-Id: Id6b64aeaace624170970d3731778f72c90074937
---
 bindings/arm/msm/msm.txt  |  1 +
 qcom/Makefile             |  3 ++-
 qcom/sdxpinn-idp-mbb.dts  | 11 +++++++++++
 qcom/sdxpinn-idp-mbb.dtsi |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 qcom/sdxpinn-idp-mbb.dts
 create mode 100644 qcom/sdxpinn-idp-mbb.dtsi

diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt
index c68dc399..e393d46e 100644
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -315,6 +315,7 @@ compatible = "qcom,khaje-idp"
 compatible = "qcom,khaje-qrd"
 compatible = "qcom,khaje-atp"
 compatible = "qcom,sdxpinn-rumi"
+compatible = "qcom,sdxpinn-idp"
 compatible = "qcom,sa410m-rumi"
 compatible = "qcom,quinvm"
 compatible = "qcom,sdxbaagha-rumi"
diff --git a/qcom/Makefile b/qcom/Makefile
index b62c07f5..53f89157 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -169,7 +169,8 @@ gen4auto-overlays-dtb-$(CONFIG_ARCH_LEMANS) +=  \
 
 dtb-y += $(gen4auto-dtb-y)
 
-sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb
+sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb \
+		sdxpinn-idp-mbb.dtb
 dtb-y += $(sdxpinn-dtb-y)
 
 sa410m_auto-dtb-$(CONFIG_ARCH_SA410M) += \
diff --git a/qcom/sdxpinn-idp-mbb.dts b/qcom/sdxpinn-idp-mbb.dts
new file mode 100644
index 00000000..8f85e377
--- /dev/null
+++ b/qcom/sdxpinn-idp-mbb.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "sdxpinn.dtsi"
+#include "sdxpinn-idp-mbb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXPINN IDP MBB";
+	compatible = "qcom,sdxpinn-idp",
+		"qcom,sdxpinn", "qcom,idp";
+	qcom,board-id = <34 0>;
+};
diff --git a/qcom/sdxpinn-idp-mbb.dtsi b/qcom/sdxpinn-idp-mbb.dtsi
new file mode 100644
index 00000000..17f1e228
--- /dev/null
+++ b/qcom/sdxpinn-idp-mbb.dtsi
@@ -0,0 +1,2 @@
+&soc {
+};