diff --git a/qcom/Makefile b/qcom/Makefile
index 0e4c4c177b6a..5e0161ebb276 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -204,14 +204,14 @@ dtbo-$(CONFIG_ARCH_YUPIK) +=    \
 	yupik-idp-overlay.dtbo \
 	yupik-atp-overlay.dtbo \
 	yupik-qrd-overlay.dtbo \
-	yupik-idps-digital-mics-overlay.dtbo \
 	yupik-idps-amoled-overlay.dtbo \
 	yupik-idp-pm7250b-overlay.dtbo \
+	yupik-idp-hsp-overlay.dtbo \
 	yupikp-idp-overlay.dtbo \
 	yupikp-atp-overlay.dtbo \
 	yupikp-qrd-overlay.dtbo \
-	yupikp-idps-digital-mics-overlay.dtbo \
 	yupikp-idps-amoled-overlay.dtbo \
+	yupikp-idp-hsp-overlay.dtbo \
 	yupik-iot-idp-overlay.dtbo \
 	yupik-iot-qrd-overlay.dtbo \
 	yupik-iot-hsp-overlay.dtbo \
@@ -226,14 +226,14 @@ yupik-rumi-overlay.dtbo-base := yupik.dtb
 yupik-idp-overlay.dtbo-base := yupik.dtb
 yupik-atp-overlay.dtbo-base := yupik.dtb
 yupik-qrd-overlay.dtbo-base := yupik.dtb
-yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb
 yupik-idps-amoled-overlay.dtbo-base := yupik.dtb
 yupik-idp-pm7250b-overlay.dtbo-base := yupik.dtb
+yupik-idp-hsp-overlay.dtbo-base := yupik-hsp.dtb
 yupikp-idp-overlay.dtbo-base := yupikp.dtb
 yupikp-atp-overlay.dtbo-base := yupikp.dtb
 yupikp-qrd-overlay.dtbo-base := yupikp.dtb
-yupikp-idps-digital-mics-overlay.dtbo-base := yupikp.dtb
 yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb
+yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb
 yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb
 yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb
@@ -247,14 +247,14 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
 	yupik-idp.dtb \
 	yupik-atp.dtb \
 	yupik-qrd.dtb \
-	yupik-idps-digital-mics.dtb \
 	yupik-idps-amoled.dtb \
 	yupik-idp-pm7250b.dtb \
+	yupik-idp-hsp.dtb \
 	yupikp-idp.dtb \
 	yupikp-atp.dtb \
 	yupikp-qrd.dtb \
-	yupikp-idps-digital-mics.dtb \
 	yupikp-idps-amoled.dtb \
+	yupikp-idp-hsp.dtb \
 	yupik-iot-idp.dtb \
 	yupik-iot-qrd.dtb \
 	yupik-iot-hsp.dtb \
diff --git a/qcom/yupik-hsp.dts b/qcom/yupik-hsp.dts
new file mode 100644
index 000000000000..da97abe6dc64
--- /dev/null
+++ b/qcom/yupik-hsp.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "yupik-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IDP HSP + SoC";
+	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
+	qcom,board-id = <0 1>;
+};
diff --git a/qcom/yupik-hsp.dtsi b/qcom/yupik-hsp.dtsi
new file mode 100644
index 000000000000..cc8df8e0eb0f
--- /dev/null
+++ b/qcom/yupik-hsp.dtsi
@@ -0,0 +1,26 @@
+#include "yupik.dtsi"
+/ {
+};
+
+&gcc {
+	clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
+		<&usb3_phy_wrapper_gcc_usb30_pipe_clk>,
+		<&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>;
+	clock-names = "bi_tcxo", "sleep_clk",
+		"usb3_phy_wrapper_gcc_usb30_pipe_clk",
+		"pcie_0_pipe_clk", "pcie_1_pipe_clk";
+
+	/delete-property/ protected-clocks;
+};
+
+&gcc_pcie_0_gdsc {
+	status = "ok";
+};
+
+&gcc_pcie_1_gdsc {
+	status = "ok";
+};
+
+&gcc_usb30_sec_gdsc {
+	status = "ok";
+};
diff --git a/qcom/yupik-idps-digital-mics-overlay.dts b/qcom/yupik-idp-hsp-overlay.dts
similarity index 53%
rename from qcom/yupik-idps-digital-mics-overlay.dts
rename to qcom/yupik-idp-hsp-overlay.dts
index 4f1b65e661ff..0b78f806c06b 100644
--- a/qcom/yupik-idps-digital-mics-overlay.dts
+++ b/qcom/yupik-idp-hsp-overlay.dts
@@ -1,10 +1,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "yupik-idps-digital-mics.dtsi"
+#include <dt-bindings/interconnect/qcom,yupik.h>
+#include "yupik-idp-hsp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";
+	model = "Qualcomm Technologies, Inc. Yupik IDP + HSP";
 	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
 	qcom,msm-id = <475 0x10000>, <515 0x10000>;
 	qcom,board-id = <34 1>;
diff --git a/qcom/yupik-idp-hsp.dts b/qcom/yupik-idp-hsp.dts
new file mode 100644
index 000000000000..4ab8c6224e2c
--- /dev/null
+++ b/qcom/yupik-idp-hsp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupik-hsp.dtsi"
+#include "yupik-idp-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IDP + HSP";
+	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/yupik-idp-hsp.dtsi b/qcom/yupik-idp-hsp.dtsi
new file mode 100644
index 000000000000..2bcd7f793027
--- /dev/null
+++ b/qcom/yupik-idp-hsp.dtsi
@@ -0,0 +1,66 @@
+#include "yupik-idp.dtsi"
+#include "qcx6490-cnss.dtsi"
+
+&wlan {
+	qcom,same-dt-multi-dev;
+};
+
+&pcie0 {
+	status = "ok";
+};
+
+&pcie0_msi {
+	status = "ok";
+};
+
+&pcie1 {
+	status = "ok";
+	qcom,boot-option = <0x0>;
+	qcom,ep-gpio = <&tlmm 19 0>;
+	pinctrl-0 = <&pcie1_perst_default
+			&pcie1_clkreq_default
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+	pinctrl-1 = <&pcie1_perst_default
+			&pcie1_clkreq_sleep
+			&pcie1_wake_default
+			&pcie1_ep_default>;
+};
+
+&pcie1_msi {
+	status = "ok";
+};
+
+&pm7325_gpios {
+	usb2_vbus_boost {
+		usb2_vbus_boost_default: usb2_vbus_boost_default {
+			pins = "gpio8";
+			function = "normal";
+			output-low;
+			power-source = <0>;	/* 1.8V input supply */
+		};
+	};
+};
+
+&soc {
+	usb2_vbus_boost_reg: usb2_vbus_boost_reg {
+		compatible = "regulator-fixed";
+		regulator-name = "usb2_vbus_boost_vreg";
+		startup-delay-us = <4000>;
+		enable-active-high;
+		gpios = <&pm7325_gpios 8 0>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb2_vbus_boost_default>;
+	};
+};
+
+&usb1 {
+	vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
+	qcom,default-mode-none;
+	status = "ok";
+};
+
+&usb2_phy1 {
+	status = "ok";
+};
diff --git a/qcom/yupik-idps-digital-mics.dts b/qcom/yupik-idps-digital-mics.dts
deleted file mode 100644
index 0adab7cdd2c4..000000000000
--- a/qcom/yupik-idps-digital-mics.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "yupik.dtsi"
-#include "yupik-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";
-	compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupik-idps-digital-mics.dtsi b/qcom/yupik-idps-digital-mics.dtsi
deleted file mode 100644
index 885e5af51402..000000000000
--- a/qcom/yupik-idps-digital-mics.dtsi
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "yupik-idp.dtsi"
-
-&soc {
-};
diff --git a/qcom/yupikp-hsp.dts b/qcom/yupikp-hsp.dts
new file mode 100644
index 000000000000..4d0392c3605f
--- /dev/null
+++ b/qcom/yupikp-hsp.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "yupikp-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IDP HSP + SoC";
+	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
+	qcom,board-id = <0 1>;
+};
diff --git a/qcom/yupikp-hsp.dtsi b/qcom/yupikp-hsp.dtsi
new file mode 100644
index 000000000000..0bbe35be28d2
--- /dev/null
+++ b/qcom/yupikp-hsp.dtsi
@@ -0,0 +1,3 @@
+#include "yupikp.dtsi"
+/ {
+};
diff --git a/qcom/yupikp-idps-digital-mics-overlay.dts b/qcom/yupikp-idp-hsp-overlay.dts
similarity index 51%
rename from qcom/yupikp-idps-digital-mics-overlay.dts
rename to qcom/yupikp-idp-hsp-overlay.dts
index ede5df06f0b6..da2b428bc2ed 100644
--- a/qcom/yupikp-idps-digital-mics-overlay.dts
+++ b/qcom/yupikp-idp-hsp-overlay.dts
@@ -1,10 +1,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "yupikp-idps-digital-mics.dtsi"
+#include <dt-bindings/interconnect/qcom,yupik.h>
+#include "yupikp-idp-hsp.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
+	model = "Qualcomm Technologies, Inc. YupikP IDP + HSP";
 	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
 	qcom,msm-id = <499 0x10000>;
 	qcom,board-id = <34 1>;
diff --git a/qcom/yupikp-idp-hsp.dts b/qcom/yupikp-idp-hsp.dts
new file mode 100644
index 000000000000..bee755e4726d
--- /dev/null
+++ b/qcom/yupikp-idp-hsp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "yupikp-hsp.dtsi"
+#include "yupikp-idp-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IDP + HSP";
+	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/yupikp-idp-hsp.dtsi b/qcom/yupikp-idp-hsp.dtsi
new file mode 100644
index 000000000000..eb5f4b6d646a
--- /dev/null
+++ b/qcom/yupikp-idp-hsp.dtsi
@@ -0,0 +1,2 @@
+#include "yupik-idp-hsp.dtsi"
+
diff --git a/qcom/yupikp-idps-digital-mics.dts b/qcom/yupikp-idps-digital-mics.dts
deleted file mode 100644
index d798a6a6a2d0..000000000000
--- a/qcom/yupikp-idps-digital-mics.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-
-#include "yupikp.dtsi"
-#include "yupikp-idps-digital-mics.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
-	compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
-	qcom,board-id = <34 1>;
-};
diff --git a/qcom/yupikp-idps-digital-mics.dtsi b/qcom/yupikp-idps-digital-mics.dtsi
deleted file mode 100644
index 12c906256483..000000000000
--- a/qcom/yupikp-idps-digital-mics.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-#include "yupik-idps-digital-mics.dtsi"