diff --git a/qcom/shima-thermal.dtsi b/qcom/shima-thermal.dtsi
index 400c81e2b65a..fc97b1dddafa 100644
--- a/qcom/shima-thermal.dtsi
+++ b/qcom/shima-thermal.dtsi
@@ -2,6 +2,23 @@
 #include "lahaina-thermal-modem.dtsi"
 
 &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>;
 
@@ -17,6 +34,38 @@
 	};
 };
 
+&soc {
+	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";
+		};
+	};
+};
+
 &cpufreq_hw {
 	qcom,cpu-isolation {
 		compatible = "qcom,cpu-isolate";
@@ -75,6 +124,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>;