diff --git a/qcom/Makefile b/qcom/Makefile
index af3f16e2..bf7b4de8 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -16,6 +16,7 @@ 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 \
diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts
index 639098f3..d4e41ba8 100644
--- a/qcom/sun-cdp-kiwi-overlay.dts
+++ b/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";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <0x20001 0>;
 };
diff --git a/qcom/sun-cdp-overlay.dts b/qcom/sun-cdp-overlay.dts
index 97abb08f..0c09832a 100644
--- a/qcom/sun-cdp-overlay.dts
+++ b/qcom/sun-cdp-overlay.dts
@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
-	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <1 0>;
 };
diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts
index 0919e9eb..ce7816c1 100644
--- a/qcom/sun-mtp-kiwi-overlay.dts
+++ b/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";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <0x20008 0>;
 };
diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts
index 891692f9..983d05f7 100644
--- a/qcom/sun-mtp-overlay.dts
+++ b/qcom/sun-mtp-overlay.dts
@@ -10,7 +10,8 @@
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
-	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <8 0>;
 };
diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts
index af5ab897..15d9cb96 100644
--- a/qcom/sun-qrd-sku1-overlay.dts
+++ b/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";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <0x1000B 0>;
 };
diff --git a/qcom/sun-qrd-sku2-overlay.dts b/qcom/sun-qrd-sku2-overlay.dts
index e63aaacd..fdafc5d7 100644
--- a/qcom/sun-qrd-sku2-overlay.dts
+++ b/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";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	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 = <0x2000B 0>;
 };
diff --git a/qcom/sunp-v2.dts b/qcom/sunp-v2.dts
new file mode 100644
index 00000000..dc47d6bb
--- /dev/null
+++ b/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>;
+};
diff --git a/qcom/sunp-v2.dtsi b/qcom/sunp-v2.dtsi
new file mode 100644
index 00000000..0809f16c
--- /dev/null
+++ b/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>;
+};
diff --git a/qcom/sunp.dts b/qcom/sunp.dts
new file mode 100644
index 00000000..68324963
--- /dev/null
+++ b/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>;
+};
diff --git a/qcom/sunp.dtsi b/qcom/sunp.dtsi
new file mode 100644
index 00000000..fec5362e
--- /dev/null
+++ b/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>;
+};