Merge "ARM: dts: msm: Add support for Tuna7 and TunaP SoC"

qcom/Makefile

@@ -255,6 +255,8 @@ tuna_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += tuna-vm-rumi.dtb \
 				tuna-vm-qrd.dtb \
 				tuna-vm-rcm.dtb \
 				tuna-vm-rcm-kiwi.dtb \
+				tunap-vm.dtb \
+				tuna7-vm.dtb \
 				tuna-oemvm-rumi.dtb \
 				tuna-oemvm-atp.dtb \
 				tuna-oemvm-cdp.dtb \
@@ -263,7 +265,9 @@ tuna_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += tuna-vm-rumi.dtb \
 				tuna-oemvm-mtp-qmp1000.dtb \
 				tuna-oemvm-qrd.dtb \
 				tuna-oemvm-rcm.dtb \
-				tuna-oemvm-rcm-kiwi.dtb
+				tuna-oemvm-rcm-kiwi.dtb \
+				tunap-oemvm.dtb \
+				tuna7-oemvm.dtb
 dtb-y += $(tuna_tuivm-dtb-y)
 endif
 endif

qcom/platform_map.bzl

@@ -263,6 +263,8 @@ _platform_map = {
             {"name": "tuna-oemvm-rcm.dtb"},
             {"name": "tuna-oemvm-rcm-kiwi.dtb"},
             {"name": "tuna-oemvm-rumi.dtb"},
+            {"name": "tunap-oemvm.dtb"},
+            {"name": "tuna7-oemvm.dtb"},
             {"name": "tuna-vm-atp.dtb"},
             {"name": "tuna-vm-cdp.dtb"},
             {"name": "tuna-vm-mtp.dtb"},
@@ -272,6 +274,8 @@ _platform_map = {
             {"name": "tuna-vm-rcm.dtb"},
             {"name": "tuna-vm-rcm-kiwi.dtb"},
             {"name": "tuna-vm-rumi.dtb"},
+            {"name": "tunap-vm.dtb"},
+            {"name": "tuna7-vm.dtb"},
         ],
     },
     "tuna-oemvm": {
@@ -286,6 +290,8 @@ _platform_map = {
             {"name": "tuna-oemvm-rcm.dtb"},
             {"name": "tuna-oemvm-rcm-kiwi.dtb"},
             {"name": "tuna-oemvm-rumi.dtb"},
+            {"name": "tunap-oemvm.dtb"},
+            {"name": "tuna7-oemvm.dtb"},
             {"name": "tuna-vm-atp.dtb"},
             {"name": "tuna-vm-cdp.dtb"},
             {"name": "tuna-vm-mtp.dtb"},
@@ -295,6 +301,8 @@ _platform_map = {
             {"name": "tuna-vm-rcm.dtb"},
             {"name": "tuna-vm-rcm-kiwi.dtb"},
             {"name": "tuna-vm-rumi.dtb"},
+            {"name": "tunap-vm.dtb"},
+            {"name": "tuna7-vm.dtb"},
         ],
     },
     "kera-tuivm": {

qcom/tuna-oemvm.dtsi

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -8,7 +8,7 @@
 / {
 	#address-cells = <0x2>;
 	#size-cells = <0x2>;
-	qcom,msm-id = <655 0x10000>;
+	qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>;
 	interrupt-parent = <&vgic>;
 
 	chosen {

qcom/tuna-vm.dtsi

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -10,7 +10,7 @@
 / {
 	#address-cells = <0x2>;
 	#size-cells = <0x2>;
-	qcom,msm-id = <681 0x10000>, <655 0x10000>;
+	qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>;
 	interrupt-parent = <&vgic>;
 
 	chosen {

qcom/tuna7-oemvm.dts

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "tuna7-oemvm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Tuna 7 OEMVM SoC";
+	compatible = "qcom,tuna";
+	qcom,board-id = <0 0>;
+};

qcom/tuna7-oemvm.dtsi

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "tuna-oemvm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Tuna 7 OEMVM";
+	compatible = "qcom,tuna";
+	qcom,msm-id = <681 0x10000>;
+};
+

qcom/tuna7-vm.dts

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "tuna7-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Tuna 7 SVM SoC";
+	compatible = "qcom,tuna";
+	qcom,board-id = <0 0>;
+};

qcom/tuna7-vm.dtsi

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "tuna-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Tuna 7 SVM";
+	compatible = "qcom,tuna";
+	qcom,msm-id = <681 0x10000>;
+};
+

qcom/tunap-oemvm.dts

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "tunap-oemvm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. TunaP OEMVM SoC";
+	compatible = "qcom,tunap";
+	qcom,board-id = <0 0>;
+};

qcom/tunap-oemvm.dtsi

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "tuna-oemvm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. TunaP OEMVM SoC";
+	compatible = "qcom,tunap";
+	qcom,msm-id = <694 0x10000>;
+};

qcom/tunap-vm.dts

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "tunap-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. TunaP SVM SoC";
+	compatible = "qcom,tunap";
+	qcom,board-id = <0 0>;
+};

qcom/tunap-vm.dtsi

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "tuna-vm.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. TunaP SVM SoC";
+	compatible = "qcom,tunap";
+	qcom,msm-id = <694 0x10000>;
+};