From 93c85556b434fc7b8f4e0984536fb4533806b9f3 Mon Sep 17 00:00:00 2001
From: Wasim Nazir <quic_wasimn@quicinc.com>
Date: Thu, 5 Dec 2024 13:45:03 +0530
Subject: [PATCH] ARM: dts: msm: Update platform DT for kera

Separate common files and create module specific files.
Common platform changes should go into platform specific
common files like kera-mtp.dtsi & module specific changes
should go into corresponding module specific files like
kera-mtp-wcn7750-ufs4.dtsi.

Change-Id: Ib8b9fa2609d7dfd883a155af9ffc54ff1fc93d79
Signed-off-by: Wasim Nazir <quic_wasimn@quicinc.com>
---
 qcom/Makefile                                 |  9 ++++-----
 qcom/kera-cdp-overlay.dts                     | 19 -------------------
 qcom/kera-cdp-qca6750-ufs2-overlay.dts        |  2 +-
 qcom/kera-cdp-qca6750-ufs2.dtsi               |  1 +
 qcom/kera-cdp-qca6750-ufs3-overlay.dts        |  2 +-
 qcom/kera-cdp-qca6750-ufs3.dtsi               |  1 +
 qcom/kera-cdp-qca6750-ufs4-overlay.dts        |  4 ++--
 qcom/kera-cdp-qca6750-ufs4.dtsi               |  1 +
 qcom/kera-mtp-qca6750-qmp1000-overlay.dts     |  2 +-
 qcom/kera-mtp-qca6750-qmp1000.dtsi            |  3 +++
 ....dts => kera-mtp-qca6750-ufs3-overlay.dts} |  4 ++--
 ...ca6750.dtsi => kera-mtp-qca6750-ufs3.dtsi} |  3 +++
 ....dts => kera-mtp-qca6750-ufs4-overlay.dts} |  4 ++--
 qcom/kera-mtp-qca6750-ufs4.dtsi               |  7 +++++++
 qcom/kera-mtp-wcn7750-qmp1000-overlay.dts     |  2 +-
 qcom/kera-mtp-wcn7750-qmp1000.dtsi            |  3 +++
 qcom/kera-mtp-wcn7750-ufs3-overlay.dts        |  2 +-
 qcom/kera-mtp-wcn7750-ufs3.dtsi               |  1 +
 qcom/kera-mtp-wcn7750-ufs4-overlay.dts        |  2 +-
 qcom/kera-mtp-wcn7750-ufs4.dtsi               |  2 +-
 qcom/kera-qrd-wcn7750-ufs2-overlay.dts        |  2 +-
 qcom/kera-qrd-wcn7750-ufs2.dtsi               |  1 +
 qcom/kera-qrd-wcn7750-ufs3-overlay.dts        |  2 +-
 qcom/kera-qrd-wcn7750-ufs3.dtsi               |  1 +
 ....dts => kera-qrd-wcn7750-ufs4-overlay.dts} |  4 ++--
 qcom/kera-qrd-wcn7750-ufs4.dtsi               |  7 +++++++
 qcom/kera-rcm-qca6750-ufs2-overlay.dts        |  2 +-
 qcom/kera-rcm-qca6750-ufs2.dtsi               |  1 +
 qcom/kera-rcm-qca6750-ufs3-overlay.dts        |  2 +-
 qcom/kera-rcm-qca6750-ufs3.dtsi               |  1 +
 ....dts => kera-rcm-qca6750-ufs4-overlay.dts} |  4 ++--
 qcom/kera-rcm-qca6750-ufs4.dtsi               |  7 +++++++
 qcom/kera-rcm-wcn7750-ufs2-overlay.dts        |  2 +-
 qcom/kera-rcm-wcn7750-ufs2.dtsi               |  1 +
 qcom/kera-rcm-wcn7750-ufs3-overlay.dts        |  2 +-
 qcom/kera-rcm-wcn7750-ufs3.dtsi               |  1 +
 qcom/kera-rcm-wcn7750-ufs4-overlay.dts        |  2 +-
 qcom/kera-rcm-wcn7750-ufs4.dtsi               |  1 +
 qcom/platform_map.bzl                         |  9 ++++-----
 39 files changed, 73 insertions(+), 53 deletions(-)
 delete mode 100644 qcom/kera-cdp-overlay.dts
 rename qcom/{kera-mtp-qca6750-overlay.dts => kera-mtp-qca6750-ufs3-overlay.dts} (77%)
 rename qcom/{kera-mtp-qca6750.dtsi => kera-mtp-qca6750-ufs3.dtsi} (70%)
 rename qcom/{kera-mtp-overlay.dts => kera-mtp-qca6750-ufs4-overlay.dts} (77%)
 create mode 100644 qcom/kera-mtp-qca6750-ufs4.dtsi
 rename qcom/{kera-qrd-overlay.dts => kera-qrd-wcn7750-ufs4-overlay.dts} (77%)
 create mode 100644 qcom/kera-qrd-wcn7750-ufs4.dtsi
 rename qcom/{kera-rcm-overlay.dts => kera-rcm-qca6750-ufs4-overlay.dts} (77%)
 create mode 100644 qcom/kera-rcm-qca6750-ufs4.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 770c72d8..51ca4378 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -80,20 +80,19 @@ KERA_BASE_DTB += kera.dtb
 KERA_APQ_BASE_DTB += kerap.dtb
 KERA_BOARDS += \
 		kera-atp-overlay.dtbo \
-		kera-mtp-overlay.dtbo \
-		kera-mtp-qca6750-overlay.dtbo \
+		kera-mtp-qca6750-ufs4-overlay.dtbo \
+		kera-mtp-qca6750-ufs3-overlay.dtbo \
 		kera-mtp-qca6750-qmp1000-overlay.dtbo \
 		kera-mtp-wcn7750-qmp1000-overlay.dtbo \
 		kera-mtp-wcn7750-ufs4-overlay.dtbo \
 		kera-mtp-wcn7750-ufs3-overlay.dtbo \
-		kera-cdp-overlay.dtbo \
 		kera-cdp-qca6750-ufs2-overlay.dtbo \
 		kera-cdp-qca6750-ufs3-overlay.dtbo \
 		kera-cdp-qca6750-ufs4-overlay.dtbo \
-		kera-qrd-overlay.dtbo \
+		kera-qrd-wcn7750-ufs4-overlay.dtbo \
 		kera-qrd-wcn7750-ufs2-overlay.dtbo \
 		kera-qrd-wcn7750-ufs3-overlay.dtbo \
-		kera-rcm-overlay.dtbo \
+		kera-rcm-qca6750-ufs4-overlay.dtbo \
 		kera-rcm-qca6750-ufs2-overlay.dtbo \
 		kera-rcm-qca6750-ufs3-overlay.dtbo \
 		kera-rcm-wcn7750-ufs2-overlay.dtbo \
diff --git a/qcom/kera-cdp-overlay.dts b/qcom/kera-cdp-overlay.dts
deleted file mode 100644
index 30e0615e..00000000
--- a/qcom/kera-cdp-overlay.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include "kera-cdp.dtsi"
-#include "kera-pmiv0102.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Kera CDP";
-	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
-			"qcom,cdp";
-
-	qcom,msm-id = <686 0x10000>, <659 0x10000>;
-	qcom,board-id = <0x10001 0>;
-};
diff --git a/qcom/kera-cdp-qca6750-ufs2-overlay.dts b/qcom/kera-cdp-qca6750-ufs2-overlay.dts
index 8e8ece00..4d940c38 100644
--- a/qcom/kera-cdp-qca6750-ufs2-overlay.dts
+++ b/qcom/kera-cdp-qca6750-ufs2-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS2.0";
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS2";
 	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
 			"qcom,cdp";
 
diff --git a/qcom/kera-cdp-qca6750-ufs2.dtsi b/qcom/kera-cdp-qca6750-ufs2.dtsi
index 0b5c9e56..ffe73fdf 100644
--- a/qcom/kera-cdp-qca6750-ufs2.dtsi
+++ b/qcom/kera-cdp-qca6750-ufs2.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-cdp.dtsi"
 #include "kera_ufs2.dtsi"
diff --git a/qcom/kera-cdp-qca6750-ufs3-overlay.dts b/qcom/kera-cdp-qca6750-ufs3-overlay.dts
index c1b0f348..448cdba5 100644
--- a/qcom/kera-cdp-qca6750-ufs3-overlay.dts
+++ b/qcom/kera-cdp-qca6750-ufs3-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS3.0";
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS3";
 	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
 			"qcom,cdp";
 
diff --git a/qcom/kera-cdp-qca6750-ufs3.dtsi b/qcom/kera-cdp-qca6750-ufs3.dtsi
index c85591f2..c75de3b3 100644
--- a/qcom/kera-cdp-qca6750-ufs3.dtsi
+++ b/qcom/kera-cdp-qca6750-ufs3.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-cdp.dtsi"
 #include "kera_ufs3.dtsi"
diff --git a/qcom/kera-cdp-qca6750-ufs4-overlay.dts b/qcom/kera-cdp-qca6750-ufs4-overlay.dts
index 9bc4ead1..747e5c50 100644
--- a/qcom/kera-cdp-qca6750-ufs4-overlay.dts
+++ b/qcom/kera-cdp-qca6750-ufs4-overlay.dts
@@ -10,10 +10,10 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS4.0";
+	model = "Qualcomm Technologies, Inc. Kera CDP + QCA6750 + UFS4";
 	compatible = "qcom,kera-cdp", "qcom,kera", "qcom,kerap-cdp", "qcom,kerap",
 			"qcom,cdp";
 
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
-	qcom,board-id = <0x40001 0>;
+	qcom,board-id = <0x10001 0>, <0x40001 0>;
 };
diff --git a/qcom/kera-cdp-qca6750-ufs4.dtsi b/qcom/kera-cdp-qca6750-ufs4.dtsi
index ddd95998..10e96578 100644
--- a/qcom/kera-cdp-qca6750-ufs4.dtsi
+++ b/qcom/kera-cdp-qca6750-ufs4.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-cdp.dtsi"
 #include "kera_ufs4.dtsi"
diff --git a/qcom/kera-mtp-qca6750-qmp1000-overlay.dts b/qcom/kera-mtp-qca6750-qmp1000-overlay.dts
index fd73b91c..b895e10a 100644
--- a/qcom/kera-mtp-qca6750-qmp1000-overlay.dts
+++ b/qcom/kera-mtp-qca6750-qmp1000-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750 + QMP1000";
+	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750 + QMP1000 + UFS3";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			 "qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-qca6750-qmp1000.dtsi b/qcom/kera-mtp-qca6750-qmp1000.dtsi
index 9df4770a..a780aeb3 100644
--- a/qcom/kera-mtp-qca6750-qmp1000.dtsi
+++ b/qcom/kera-mtp-qca6750-qmp1000.dtsi
@@ -2,3 +2,6 @@
 /*
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
+
+#include "kera-mtp.dtsi"
+#include "kera_ufs3.dtsi"
diff --git a/qcom/kera-mtp-qca6750-overlay.dts b/qcom/kera-mtp-qca6750-ufs3-overlay.dts
similarity index 77%
rename from qcom/kera-mtp-qca6750-overlay.dts
rename to qcom/kera-mtp-qca6750-ufs3-overlay.dts
index eed9755e..88543d2c 100644
--- a/qcom/kera-mtp-qca6750-overlay.dts
+++ b/qcom/kera-mtp-qca6750-ufs3-overlay.dts
@@ -6,11 +6,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "kera-mtp-qca6750.dtsi"
+#include "kera-mtp-qca6750-ufs3.dtsi"
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750";
+	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750 + UFS3";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			"qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-qca6750.dtsi b/qcom/kera-mtp-qca6750-ufs3.dtsi
similarity index 70%
rename from qcom/kera-mtp-qca6750.dtsi
rename to qcom/kera-mtp-qca6750-ufs3.dtsi
index 9df4770a..a780aeb3 100644
--- a/qcom/kera-mtp-qca6750.dtsi
+++ b/qcom/kera-mtp-qca6750-ufs3.dtsi
@@ -2,3 +2,6 @@
 /*
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
+
+#include "kera-mtp.dtsi"
+#include "kera_ufs3.dtsi"
diff --git a/qcom/kera-mtp-overlay.dts b/qcom/kera-mtp-qca6750-ufs4-overlay.dts
similarity index 77%
rename from qcom/kera-mtp-overlay.dts
rename to qcom/kera-mtp-qca6750-ufs4-overlay.dts
index c14bf65c..6c39dad6 100644
--- a/qcom/kera-mtp-overlay.dts
+++ b/qcom/kera-mtp-qca6750-ufs4-overlay.dts
@@ -6,11 +6,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "kera-mtp.dtsi"
+#include "kera-mtp-qca6750-ufs4.dtsi"
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP";
+	model = "Qualcomm Technologies, Inc. Kera MTP + QCA6750 + UFS4";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			"qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-qca6750-ufs4.dtsi b/qcom/kera-mtp-qca6750-ufs4.dtsi
new file mode 100644
index 00000000..f30576eb
--- /dev/null
+++ b/qcom/kera-mtp-qca6750-ufs4.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "kera-mtp.dtsi"
+#include "kera_ufs4.dtsi"
diff --git a/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts b/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts
index 5313ff1c..75259c55 100644
--- a/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts
+++ b/qcom/kera-mtp-wcn7750-qmp1000-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + QMP1000";
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + QMP1000 + UFS3";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			"qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-wcn7750-qmp1000.dtsi b/qcom/kera-mtp-wcn7750-qmp1000.dtsi
index 9df4770a..a780aeb3 100644
--- a/qcom/kera-mtp-wcn7750-qmp1000.dtsi
+++ b/qcom/kera-mtp-wcn7750-qmp1000.dtsi
@@ -2,3 +2,6 @@
 /*
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
+
+#include "kera-mtp.dtsi"
+#include "kera_ufs3.dtsi"
diff --git a/qcom/kera-mtp-wcn7750-ufs3-overlay.dts b/qcom/kera-mtp-wcn7750-ufs3-overlay.dts
index b5649315..634fe890 100644
--- a/qcom/kera-mtp-wcn7750-ufs3-overlay.dts
+++ b/qcom/kera-mtp-wcn7750-ufs3-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS3.0";
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS3";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			"qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-wcn7750-ufs3.dtsi b/qcom/kera-mtp-wcn7750-ufs3.dtsi
index c85591f2..a780aeb3 100644
--- a/qcom/kera-mtp-wcn7750-ufs3.dtsi
+++ b/qcom/kera-mtp-wcn7750-ufs3.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-mtp.dtsi"
 #include "kera_ufs3.dtsi"
diff --git a/qcom/kera-mtp-wcn7750-ufs4-overlay.dts b/qcom/kera-mtp-wcn7750-ufs4-overlay.dts
index cd3883be..06a3fd50 100644
--- a/qcom/kera-mtp-wcn7750-ufs4-overlay.dts
+++ b/qcom/kera-mtp-wcn7750-ufs4-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pm7550ba.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS4.0";
+	model = "Qualcomm Technologies, Inc. Kera MTP + WCN7750 + UFS4";
 	compatible = "qcom,kera-mtp", "qcom,kera", "qcom,kerap-mtp", "qcom,kerap",
 			"qcom,mtp";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-mtp-wcn7750-ufs4.dtsi b/qcom/kera-mtp-wcn7750-ufs4.dtsi
index 4593e4d3..f30576eb 100644
--- a/qcom/kera-mtp-wcn7750-ufs4.dtsi
+++ b/qcom/kera-mtp-wcn7750-ufs4.dtsi
@@ -3,5 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-mtp.dtsi"
 #include "kera_ufs4.dtsi"
-
diff --git a/qcom/kera-qrd-wcn7750-ufs2-overlay.dts b/qcom/kera-qrd-wcn7750-ufs2-overlay.dts
index 9442ddc8..10cd2559 100644
--- a/qcom/kera-qrd-wcn7750-ufs2-overlay.dts
+++ b/qcom/kera-qrd-wcn7750-ufs2-overlay.dts
@@ -9,7 +9,7 @@
 #include "kera-qrd-wcn7750-ufs2.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera QRD";
+	model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS2";
 	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
 			"qcom,qrd";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-qrd-wcn7750-ufs2.dtsi b/qcom/kera-qrd-wcn7750-ufs2.dtsi
index 0b5c9e56..5743706b 100644
--- a/qcom/kera-qrd-wcn7750-ufs2.dtsi
+++ b/qcom/kera-qrd-wcn7750-ufs2.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-qrd.dtsi"
 #include "kera_ufs2.dtsi"
diff --git a/qcom/kera-qrd-wcn7750-ufs3-overlay.dts b/qcom/kera-qrd-wcn7750-ufs3-overlay.dts
index 0ab56d62..533095a1 100644
--- a/qcom/kera-qrd-wcn7750-ufs3-overlay.dts
+++ b/qcom/kera-qrd-wcn7750-ufs3-overlay.dts
@@ -9,7 +9,7 @@
 #include "kera-qrd-wcn7750-ufs3.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS3.0";
+	model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS3";
 	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
 			"qcom,qrd";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-qrd-wcn7750-ufs3.dtsi b/qcom/kera-qrd-wcn7750-ufs3.dtsi
index c85591f2..0a4228ff 100644
--- a/qcom/kera-qrd-wcn7750-ufs3.dtsi
+++ b/qcom/kera-qrd-wcn7750-ufs3.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-qrd.dtsi"
 #include "kera_ufs3.dtsi"
diff --git a/qcom/kera-qrd-overlay.dts b/qcom/kera-qrd-wcn7750-ufs4-overlay.dts
similarity index 77%
rename from qcom/kera-qrd-overlay.dts
rename to qcom/kera-qrd-wcn7750-ufs4-overlay.dts
index f876df7e..0407343c 100644
--- a/qcom/kera-qrd-overlay.dts
+++ b/qcom/kera-qrd-wcn7750-ufs4-overlay.dts
@@ -6,11 +6,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "kera-qrd.dtsi"
+#include "kera-qrd-wcn7750-ufs4.dtsi"
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera QRD";
+	model = "Qualcomm Technologies, Inc. Kera QRD + WCN7750 + UFS4";
 	compatible = "qcom,kera-qrd", "qcom,kera", "qcom,kerap-qrd", "qcom,kerap",
 			"qcom,qrd";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-qrd-wcn7750-ufs4.dtsi b/qcom/kera-qrd-wcn7750-ufs4.dtsi
new file mode 100644
index 00000000..d28259d2
--- /dev/null
+++ b/qcom/kera-qrd-wcn7750-ufs4.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "kera-qrd.dtsi"
+#include "kera_ufs4.dtsi"
diff --git a/qcom/kera-rcm-qca6750-ufs2-overlay.dts b/qcom/kera-rcm-qca6750-ufs2-overlay.dts
index e83f911d..df5f9933 100644
--- a/qcom/kera-rcm-qca6750-ufs2-overlay.dts
+++ b/qcom/kera-rcm-qca6750-ufs2-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS2.0";
+	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS2";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-qca6750-ufs2.dtsi b/qcom/kera-rcm-qca6750-ufs2.dtsi
index 0b5c9e56..dc823592 100644
--- a/qcom/kera-rcm-qca6750-ufs2.dtsi
+++ b/qcom/kera-rcm-qca6750-ufs2.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-rcm.dtsi"
 #include "kera_ufs2.dtsi"
diff --git a/qcom/kera-rcm-qca6750-ufs3-overlay.dts b/qcom/kera-rcm-qca6750-ufs3-overlay.dts
index cd2324cc..b41df9c0 100644
--- a/qcom/kera-rcm-qca6750-ufs3-overlay.dts
+++ b/qcom/kera-rcm-qca6750-ufs3-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS3.0";
+	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS3";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-qca6750-ufs3.dtsi b/qcom/kera-rcm-qca6750-ufs3.dtsi
index c85591f2..99203b93 100644
--- a/qcom/kera-rcm-qca6750-ufs3.dtsi
+++ b/qcom/kera-rcm-qca6750-ufs3.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-rcm.dtsi"
 #include "kera_ufs3.dtsi"
diff --git a/qcom/kera-rcm-overlay.dts b/qcom/kera-rcm-qca6750-ufs4-overlay.dts
similarity index 77%
rename from qcom/kera-rcm-overlay.dts
rename to qcom/kera-rcm-qca6750-ufs4-overlay.dts
index 5b58b3c0..973cd065 100644
--- a/qcom/kera-rcm-overlay.dts
+++ b/qcom/kera-rcm-qca6750-ufs4-overlay.dts
@@ -6,11 +6,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "kera-rcm.dtsi"
+#include "kera-rcm-qca6750-ufs4.dtsi"
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera RCM";
+	model = "Qualcomm Technologies, Inc. Kera RCM + QCA6750 + UFS4";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-qca6750-ufs4.dtsi b/qcom/kera-rcm-qca6750-ufs4.dtsi
new file mode 100644
index 00000000..4834e869
--- /dev/null
+++ b/qcom/kera-rcm-qca6750-ufs4.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "kera-rcm.dtsi"
+#include "kera_ufs4.dtsi"
diff --git a/qcom/kera-rcm-wcn7750-ufs2-overlay.dts b/qcom/kera-rcm-wcn7750-ufs2-overlay.dts
index 2818adee..2edce214 100644
--- a/qcom/kera-rcm-wcn7750-ufs2-overlay.dts
+++ b/qcom/kera-rcm-wcn7750-ufs2-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS2.0";
+	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS2";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-wcn7750-ufs2.dtsi b/qcom/kera-rcm-wcn7750-ufs2.dtsi
index 0b5c9e56..dc823592 100644
--- a/qcom/kera-rcm-wcn7750-ufs2.dtsi
+++ b/qcom/kera-rcm-wcn7750-ufs2.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-rcm.dtsi"
 #include "kera_ufs2.dtsi"
diff --git a/qcom/kera-rcm-wcn7750-ufs3-overlay.dts b/qcom/kera-rcm-wcn7750-ufs3-overlay.dts
index a4b13d98..00131475 100644
--- a/qcom/kera-rcm-wcn7750-ufs3-overlay.dts
+++ b/qcom/kera-rcm-wcn7750-ufs3-overlay.dts
@@ -10,7 +10,7 @@
 #include "kera-pmiv0102.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. KERA RCM + WCN7750 + UFS3.0";
+	model = "Qualcomm Technologies, Inc. KERA RCM + WCN7750 + UFS3";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-wcn7750-ufs3.dtsi b/qcom/kera-rcm-wcn7750-ufs3.dtsi
index c85591f2..99203b93 100644
--- a/qcom/kera-rcm-wcn7750-ufs3.dtsi
+++ b/qcom/kera-rcm-wcn7750-ufs3.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-rcm.dtsi"
 #include "kera_ufs3.dtsi"
diff --git a/qcom/kera-rcm-wcn7750-ufs4-overlay.dts b/qcom/kera-rcm-wcn7750-ufs4-overlay.dts
index de8e0e89..d3816403 100644
--- a/qcom/kera-rcm-wcn7750-ufs4-overlay.dts
+++ b/qcom/kera-rcm-wcn7750-ufs4-overlay.dts
@@ -9,7 +9,7 @@
 #include "kera-rcm-wcn7750-ufs4.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS4.0";
+	model = "Qualcomm Technologies, Inc. Kera RCM + WCN7750 + UFS4";
 	compatible = "qcom,kera-rcm", "qcom,kera", "qcom,kerap-rcm", "qcom,kerap",
 			"qcom,rcm";
 	qcom,msm-id = <686 0x10000>, <659 0x10000>;
diff --git a/qcom/kera-rcm-wcn7750-ufs4.dtsi b/qcom/kera-rcm-wcn7750-ufs4.dtsi
index ddd95998..4834e869 100644
--- a/qcom/kera-rcm-wcn7750-ufs4.dtsi
+++ b/qcom/kera-rcm-wcn7750-ufs4.dtsi
@@ -3,4 +3,5 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "kera-rcm.dtsi"
 #include "kera_ufs4.dtsi"
diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl
index be9a3aae..57b2524b 100644
--- a/qcom/platform_map.bzl
+++ b/qcom/platform_map.bzl
@@ -114,20 +114,19 @@ _platform_map = {
                 "apq": False,
             },
             {"name": "kera-atp-overlay.dtbo"},
-            {"name": "kera-mtp-overlay.dtbo"},
-            {"name": "kera-mtp-qca6750-overlay.dtbo"},
+            {"name": "kera-mtp-qca6750-ufs4-overlay.dtbo"},
+            {"name": "kera-mtp-qca6750-ufs3-overlay.dtbo"},
             {"name": "kera-mtp-qca6750-qmp1000-overlay.dtbo"},
             {"name": "kera-mtp-wcn7750-qmp1000-overlay.dtbo"},
             {"name": "kera-mtp-wcn7750-ufs3-overlay.dtbo"},
             {"name": "kera-mtp-wcn7750-ufs4-overlay.dtbo"},
-            {"name": "kera-cdp-overlay.dtbo"},
             {"name": "kera-cdp-qca6750-ufs2-overlay.dtbo"},
             {"name": "kera-cdp-qca6750-ufs3-overlay.dtbo"},
             {"name": "kera-cdp-qca6750-ufs4-overlay.dtbo"},
-            {"name": "kera-qrd-overlay.dtbo"},
+            {"name": "kera-qrd-wcn7750-ufs4-overlay.dtbo"},
             {"name": "kera-qrd-wcn7750-ufs2-overlay.dtbo"},
             {"name": "kera-qrd-wcn7750-ufs3-overlay.dtbo"},
-            {"name": "kera-rcm-overlay.dtbo"},
+            {"name": "kera-rcm-qca6750-ufs4-overlay.dtbo"},
             {"name": "kera-rcm-qca6750-ufs2-overlay.dtbo"},
             {"name": "kera-rcm-qca6750-ufs3-overlay.dtbo"},
             {"name": "kera-rcm-wcn7750-ufs2-overlay.dtbo"},