diff --git a/qcom/Makefile b/qcom/Makefile
index 873f8c29cdb9..ed4144c17d14 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -237,13 +237,17 @@ dtbo-$(CONFIG_ARCH_YUPIK) +=    \
 	yupik-iot-idp-pm7250b-overlay.dtbo \
 	yupik-iot-qrd-overlay.dtbo \
 	yupik-iot-hsp-overlay.dtbo \
+	katmai-hsp-overlay.dtbo \
 	yupik-iot-hsp-pm7250b-overlay.dtbo \
+	katmai-hsp-pm7250b-overlay.dtbo \
 	yupik-iot-idps-amoled-overlay.dtbo \
 	yupikp-iot-idp-overlay.dtbo \
 	yupikp-iot-idp-pm7250b-overlay.dtbo \
 	yupikp-iot-qrd-overlay.dtbo \
 	yupikp-iot-hsp-overlay.dtbo \
+	katmaip-hsp-overlay.dtbo \
 	yupikp-iot-hsp-pm7250b-overlay.dtbo \
+	katmaip-hsp-pm7250b-overlay.dtbo \
 	yupikp-iot-idps-amoled-overlay.dtbo
 
 
@@ -262,14 +266,18 @@ yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb
 yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
 yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
 yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
-yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
-yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
-yupik-iot-idps-amoled-overlay.dtbo-base := yupik-iot.dtb katmai.dtb
+yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb
+katmai-hsp-overlay.dtbo-base :=  katmai.dtb
+yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb
+katmai-hsp-pm7250b-overlay.dtbo-base :=  katmai.dtb
+yupik-iot-idps-amoled-overlay.dtbo-base := katmai.dtb
 yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
 yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
 yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
-yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
-yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
+yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb
+katmaip-hsp-overlay.dtbo-base := katmaip.dtb
+yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb
+katmaip-hsp-pm7250b-overlay.dtbo-base := katmaip.dtb
 yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb
 else
 dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \
diff --git a/qcom/katmai-hsp-overlay.dts b/qcom/katmai-hsp-overlay.dts
new file mode 100644
index 000000000000..806c0f45d4dd
--- /dev/null
+++ b/qcom/katmai-hsp-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/interconnect/qcom,yupik.h>
+#include "katmai-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IoT HSP";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/katmai-hsp-pm7250b-overlay.dts b/qcom/katmai-hsp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..fa1178cf9bc2
--- /dev/null
+++ b/qcom/katmai-hsp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "katmai-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Yupik IOT HSP + PM7250B";
+	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";
+	qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/katmai-hsp-pm7250b.dtsi b/qcom/katmai-hsp-pm7250b.dtsi
new file mode 100644
index 000000000000..82aceb806a2c
--- /dev/null
+++ b/qcom/katmai-hsp-pm7250b.dtsi
@@ -0,0 +1,10 @@
+#include "yupik-iot-hsp-pm7250b.dtsi"
+
+&pcie1 {
+	status = "disabled";
+};
+
+&pcie1_msi {
+	status = "disabled";
+};
+
diff --git a/qcom/katmai-hsp.dtsi b/qcom/katmai-hsp.dtsi
new file mode 100644
index 000000000000..2ae682e6e881
--- /dev/null
+++ b/qcom/katmai-hsp.dtsi
@@ -0,0 +1,9 @@
+#include "yupik-iot-hsp.dtsi"
+
+&pcie1 {
+	status = "disabled";
+};
+
+&pcie1_msi {
+	status = "disabled";
+};
diff --git a/qcom/katmaip-hsp-overlay.dts b/qcom/katmaip-hsp-overlay.dts
new file mode 100644
index 000000000000..bb8b4be0978e
--- /dev/null
+++ b/qcom/katmaip-hsp-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/interconnect/qcom,yupik.h>
+#include "katmaip-hsp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IoT HSP";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/katmaip-hsp-pm7250b-overlay.dts b/qcom/katmaip-hsp-pm7250b-overlay.dts
new file mode 100644
index 000000000000..69f48f511d31
--- /dev/null
+++ b/qcom/katmaip-hsp-pm7250b-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "katmaip-hsp-pm7250b.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. YupikP IOT HSP + PM7250B";
+	compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp";
+	qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>;
+	qcom,board-id = <34 1>;
+};
diff --git a/qcom/katmaip-hsp-pm7250b.dtsi b/qcom/katmaip-hsp-pm7250b.dtsi
new file mode 100644
index 000000000000..789376a38c6b
--- /dev/null
+++ b/qcom/katmaip-hsp-pm7250b.dtsi
@@ -0,0 +1,9 @@
+#include "yupikp-iot-hsp-pm7250b.dtsi"
+
+&pcie1 {
+	status = "disabled";
+};
+
+&pcie1_msi {
+	status = "disabled";
+};
diff --git a/qcom/katmaip-hsp.dtsi b/qcom/katmaip-hsp.dtsi
new file mode 100644
index 000000000000..77283c6341e6
--- /dev/null
+++ b/qcom/katmaip-hsp.dtsi
@@ -0,0 +1,9 @@
+#include "yupikp-iot-hsp.dtsi"
+
+&pcie1 {
+	status = "disabled";
+};
+
+&pcie1_msi {
+	status = "disabled";
+};