diff --git a/qcom/lahaina-pmic-overlay.dtsi b/qcom/lahaina-pmic-overlay.dtsi
index 052c892cc915..5bb23e5950e5 100644
--- a/qcom/lahaina-pmic-overlay.dtsi
+++ b/qcom/lahaina-pmic-overlay.dtsi
@@ -607,6 +607,27 @@
 			};
 		};
 	};
+
+	xo-therm-step {
+		polling-delay-passive = <0>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
+
+		trips {
+			xo_config0: active-config0 {
+				temperature = <78000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			xo_config1: active-config1 {
+				temperature = <80000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+	};
 };
 
 &soc {
diff --git a/qcom/lahaina-thermal-overlay.dtsi b/qcom/lahaina-thermal-overlay.dtsi
index 2889f53abedb..15a3f166fc78 100644
--- a/qcom/lahaina-thermal-overlay.dtsi
+++ b/qcom/lahaina-thermal-overlay.dtsi
@@ -296,4 +296,60 @@
 			};
 		};
 	};
+
+	xo-therm-step {
+		cooling-maps {
+			cpu4_freq_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+
+			cpu7_freq_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&CPU7 THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+
+			cpu4_iso_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&cpu4_isolate 1 1>;
+			};
+
+			cpu5_iso_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&cpu5_isolate 1 1>;
+			};
+
+			cpu6_iso_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&cpu6_isolate 1 1>;
+			};
+
+			cpu7_iso_cdev {
+				trip = <&xo_config0>;
+				cooling-device = <&cpu7_isolate 1 1>;
+			};
+
+			cpu4_hot_cdev {
+				trip = <&xo_config1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
+
+			cpu5_hot_cdev {
+				trip = <&xo_config1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
+
+			cpu6_hot_cdev {
+				trip = <&xo_config1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
+
+			cpu7_hot_cdev {
+				trip = <&xo_config1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
+		};
+	};
 };
diff --git a/qcom/lahaina-thermal.dtsi b/qcom/lahaina-thermal.dtsi
index 3ed3d6eaac4b..933fdf203ac5 100644
--- a/qcom/lahaina-thermal.dtsi
+++ b/qcom/lahaina-thermal.dtsi
@@ -1218,6 +1218,12 @@
 				hysteresis = <1>;
 				type = "passive";
 			};
+
+			mx_pe_config3: mx-pe-config3 {
+				temperature = <3>;
+				hysteresis = <1>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -1230,6 +1236,11 @@
 				trip = <&mx_pe_config2>;
 				cooling-device = <&msm_gpu 1 1>;
 			};
+
+			mx_pe_cdev_3 {
+				trip = <&mx_pe_config3>;
+				cooling-device = <&modem_tj 1 1>;
+			};
 		};
 	};
 
@@ -1258,6 +1269,12 @@
 			};
 
 			cx_pe_config4: cx-pe-config4 {
+				temperature = <4>;
+				hysteresis = <1>;
+				type = "passive";
+			};
+
+			cx_pe_config5: cx-pe-config5 {
 				temperature = <5>;
 				hysteresis = <2>;
 				type = "passive";
@@ -1282,6 +1299,11 @@
 
 			cx_pe_cdev_4 {
 				trip = <&cx_pe_config4>;
+				cooling-device = <&modem_tj 1 1>;
+			};
+
+			cx_pe_cdev_5 {
+				trip = <&cx_pe_config5>;
 				cooling-device = <&cdsp_sw 4 4>;
 			};
 		};