Merge "ARM: dts: msm: Add v8 Power Grid DT support on Sun SoC"

bindings/arm/msm/msm.yaml

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/arm/msm.yaml#
+$id: http://devicetree.org/schemas/arm/msm/msm.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
 title: Qualcomm Technologies, Inc. MSM
@@ -54,4 +54,15 @@ properties:
               - qcom,rumi
           - const: qcom,sun
 
+      - description: Qualcomm Technologies, Inc. SUNP RUMI
+        items:
+          - enum:
+              - qcom,sunp-cdp
+              - qcom,cdp
+              - qcom,sunp-mtp
+              - qcom,mtp
+              - qcom,sunp-qrd
+              - qcom,qrd
+          - const: qcom,sunp
+
 additionalProperties: true

qcom/Makefile

@@ -16,13 +16,19 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 
 SUN_BASE_DTB += sun.dtb sun-v2.dtb
+SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb
 
 SUN_BOARDS += \
 		 sun-mtp-overlay.dtbo \
 		 sun-mtp-kiwi-overlay.dtbo \
+		 sun-mtp-nfc-overlay.dtbo \
+		 sun-mtp-v8-overlay.dtbo \
 		 sun-cdp-overlay.dtbo \
 		 sun-cdp-kiwi-overlay.dtbo \
+		 sun-cdp-nfc-overlay.dtbo \
+		 sun-cdp-v8-overlay.dtbo \
 		 sun-qrd-sku1-overlay.dtbo \
+		 sun-qrd-sku1-v8-overlay.dtbo \
 		 sun-qrd-sku2-overlay.dtbo
 
 NOAPQ_SUN_BOARDS += \

qcom/sun-cdp-kiwi-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN";
-	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x20001 0>;
 };

qcom/sun-cdp-nfc-overlay.dts

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-cdp-nfc.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun CDP SN300 NFC";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x40001 0>;
+};

qcom/sun-cdp-nfc.dtsi

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-cdp.dtsi"

qcom/sun-cdp-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
-	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <1 0>;
 };

qcom/sun-cdp-v8-overlay.dts

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-cdp-v8.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun CDP V8 Power Grid";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp",
+			   "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x50001 0>;
+};

qcom/sun-cdp-v8.dtsi

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-cdp.dtsi"

qcom/sun-mtp-kiwi-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN";
-	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x20008 0>;
 };

qcom/sun-mtp-nfc-overlay.dts

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-mtp-nfc.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP SN300 NFC";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x30008 0>;
+};

qcom/sun-mtp-nfc.dtsi

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-mtp.dtsi"

qcom/sun-mtp-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
-	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <8 0>;
 };

qcom/sun-mtp-v8-overlay.dts

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-mtp-v8.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP V8 Power Grid";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
+			   "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x40008 0>;
+};

qcom/sun-mtp-v8.dtsi

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-mtp.dtsi"

qcom/sun-qrd-sku1-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun QRD SKU1";
-	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
+	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,qrd";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x1000B 0>;
 };

qcom/sun-qrd-sku1-v8-overlay.dts

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-qrd-sku1-v8.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid";
+	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp",
+			   "qcom,qrd";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x3000B 0>;
+};

qcom/sun-qrd-sku1-v8.dtsi

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-qrd-sku1.dtsi"

qcom/sun-qrd-sku2-overlay.dts

@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun QRD SKU2";
-	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
+	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp",
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+			   "qcom,qrd";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x2000B 0>;
 };

qcom/sunp-v2.dts

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

qcom/sunp-v2.dtsi

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SunP v2 SoC";
+	compatible = "qcom,sunp";
+	qcom,msm-id = <639 0x20000>;
+};

qcom/sunp.dts

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

qcom/sunp.dtsi

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SunP SoC";
+	compatible = "qcom,sunp";
+	qcom,msm-id = <639 0x10000>;
+};