diff --git a/qcom/yupik-thermal.dtsi b/qcom/yupik-thermal.dtsi
index a782db14875d..12aacca763fe 100644
--- a/qcom/yupik-thermal.dtsi
+++ b/qcom/yupik-thermal.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/thermal/thermal_qti.h>
+#include "lahaina-thermal-modem.dtsi"
 
 &soc {
 	tsens0:tsens@c222000 {
@@ -30,6 +31,69 @@
 				"tsens-0C";
 		#thermal-sensor-cells = <1>;
 	};
+
+	qmi-ts-sensors {
+		modem {
+			qcom,qmi-sensor-names = "pa",
+						"pa_1",
+						"qfe_wtr0",
+						"modem_tsens",
+						"qfe_mmw0",
+						"qfe_mmw1",
+						"qfe_mmw2",
+						"qfe_mmw3",
+						"xo_therm",
+						"qfe_mmw_streamer0",
+						"qfe_mmw0_mod",
+						"qfe_mmw1_mod",
+						"qfe_mmw2_mod",
+						"qfe_mmw3_mod",
+						"qfe_ret_pa0",
+						"qfe_wtr_pa0",
+						"qfe_wtr_pa1",
+						"qfe_wtr_pa2",
+						"qfe_wtr_pa3",
+						"sys_therm1",
+						"modem_tsens1",
+						"mmw_pa1",
+						"mmw_pa2",
+						"mmw_pa3",
+						"msm_skin_therm";
+		};
+	};
+};
+
+&qmi_tmd {
+	modem {
+		modem_current: modem_current {
+			qcom,qmi-dev-name = "modem_current";
+			#cooling-cells = <2>;
+		};
+
+		modem_bw_backoff: modem_bw_backoff {
+			qcom,qmi-dev-name = "modem_bw_backoff";
+			#cooling-cells = <2>;
+		};
+
+		modem_wlan_bw: modem_wlan_bw {
+			qcom,qmi-dev-name = "wlan_bw";
+			#cooling-cells = <2>;
+		};
+	};
+
+	cdsp {
+		qcom,instance-id = <QMI_CDSP_INST_ID>;
+
+		cdsp_sw: cdsp {
+			qcom,qmi-dev-name = "cdsp_sw";
+			#cooling-cells = <2>;
+		};
+
+		cdsp_hw: cdsp_hw {
+			qcom,qmi-dev-name = "cdsp_hw";
+			#cooling-cells = <2>;
+		};
+	};
 };
 
 &cpufreq_hw {
@@ -129,6 +193,24 @@
 };
 
 &thermal_zones {
+	/delete-node/ modem-sdr-mmw-usr;
+	/delete-node/ modem-ambient-usr;
+
+	msm-skin-therm-usr {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "user_space";
+		thermal-sensors = <&qmi_sensor
+				(QMI_MODEM_INST_ID+QMI_MSM_SKIN)>;
+		trips {
+			active-config0 {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+		};
+	};
+
 	aoss-0-usr {
 		polling-delay-passive = <0>;
 		polling-delay = <0>;
@@ -1088,4 +1170,58 @@
 			};
 		};
 	};
+
+	nspss-0-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 3>;
+		trips {
+			nspss0_trip: nspss0-trip {
+				temperature = <100000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cdsp-cdev {
+				trip = <&nspss0_trip>;
+				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
+						THERMAL_MAX_LIMIT>;
+			};
+
+			modem-pa-cdev {
+				trip = <&nspss0_trip>;
+				cooling-device = <&modem_pa 3 3>;
+			};
+		};
+	};
+
+	nspss-1-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&tsens1 4>;
+		trips {
+			nspss1_trip: nspss1-trip {
+				temperature = <100000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cdsp-cdev {
+				trip = <&nspss1_trip>;
+				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
+						THERMAL_MAX_LIMIT>;
+			};
+
+			modem-pa-cdev {
+				trip = <&nspss1_trip>;
+				cooling-device = <&modem_pa 3 3>;
+			};
+		};
+	};
 };