Merge "ARM: dts: msm: Update platform DT for kera"

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-ufs4-overlay.dtbo \
-		kera-mtp-qca6750-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 \

qcom/kera-cdp-overlay.dts

@@ -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>;
-};

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";
 

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"

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";
 

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"

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>;
 };

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"
-

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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>;

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"

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-ufs4-overlay.dtbo"},
-            {"name": "kera-mtp-qca6750-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"},