diff --git a/qcom/pm8350.dtsi b/qcom/pm8350.dtsi
index f833cdfc..3b6251e0 100644
--- a/qcom/pm8350.dtsi
+++ b/qcom/pm8350.dtsi
@@ -39,6 +39,12 @@
 		thermal-sensors = <&pm8350_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pm8350_trip0: trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -48,13 +54,13 @@
 			pm8350_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pm8350_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/pm8350b.dtsi b/qcom/pm8350b.dtsi
index 0df2b250..f7e8b287 100644
--- a/qcom/pm8350b.dtsi
+++ b/qcom/pm8350b.dtsi
@@ -231,8 +231,14 @@
 		thermal-sensors = <&pm8350b_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pm8350b_trip0: trip0 {
-				temperature = <95000>;
+				temperature = <90000>;
 				hysteresis = <0>;
 				type = "passive";
 			};
@@ -240,13 +246,13 @@
 			pm8350b_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pm8350b_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/pm8350c.dtsi b/qcom/pm8350c.dtsi
index 18213cc1..a915c6e8 100644
--- a/qcom/pm8350c.dtsi
+++ b/qcom/pm8350c.dtsi
@@ -235,6 +235,12 @@
 		thermal-sensors = <&pm8350c_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pm8350c_trip0: trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -244,13 +250,13 @@
 			pm8350c_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pm8350c_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/pm8450.dtsi b/qcom/pm8450.dtsi
index 3e6292f1..f4023256 100644
--- a/qcom/pm8450.dtsi
+++ b/qcom/pm8450.dtsi
@@ -39,6 +39,12 @@
 		thermal-sensors = <&pm8450_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pm8450_trip0: trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -48,13 +54,13 @@
 			pm8450_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pm8450_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/pmr735a.dtsi b/qcom/pmr735a.dtsi
index d1459e15..457a6a20 100644
--- a/qcom/pmr735a.dtsi
+++ b/qcom/pmr735a.dtsi
@@ -39,6 +39,12 @@
 		thermal-sensors = <&pmr735a_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pmr735a_trip0: trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -48,13 +54,13 @@
 			pmr735a_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pmr735a_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/pmr735b.dtsi b/qcom/pmr735b.dtsi
index 50f05e4a..0556b3f9 100644
--- a/qcom/pmr735b.dtsi
+++ b/qcom/pmr735b.dtsi
@@ -39,6 +39,12 @@
 		thermal-sensors = <&pmr735b_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			pmr735b_trip0: trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -48,13 +54,13 @@
 			pmr735b_trip1: trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			pmr735b_trip2: trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/waipio-pm8010-spmi.dtsi b/qcom/waipio-pm8010-spmi.dtsi
index bdee755e..9118ea77 100644
--- a/qcom/waipio-pm8010-spmi.dtsi
+++ b/qcom/waipio-pm8010-spmi.dtsi
@@ -225,6 +225,12 @@
 		thermal-sensors = <&pm8010i_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -234,13 +240,13 @@
 			trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
@@ -252,6 +258,12 @@
 		thermal-sensors = <&pm8010j_tz>;
 
 		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			trip0 {
 				temperature = <95000>;
 				hysteresis = <0>;
@@ -261,13 +273,13 @@
 			trip1 {
 				temperature = <115000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 
 			trip2 {
 				temperature = <145000>;
 				hysteresis = <0>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
diff --git a/qcom/waipio-pmic-overlay.dtsi b/qcom/waipio-pmic-overlay.dtsi
index c512ffaf..cf11c708 100644
--- a/qcom/waipio-pmic-overlay.dtsi
+++ b/qcom/waipio-pmic-overlay.dtsi
@@ -457,12 +457,6 @@
 				type = "passive";
 			};
 
-			xo_config2: xo-config2 {
-				temperature = <90000>;
-				hysteresis = <10000>;
-				type = "critical";
-			};
-
 			display_test_config1: display-test-config1 {
 				temperature = <125000>;
 				hysteresis = <1000>;
diff --git a/qcom/waipio-thermal.dtsi b/qcom/waipio-thermal.dtsi
index b9f1e31f..a8ac6f72 100644
--- a/qcom/waipio-thermal.dtsi
+++ b/qcom/waipio-thermal.dtsi
@@ -300,7 +300,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
@@ -319,7 +319,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
@@ -338,7 +338,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
@@ -357,7 +357,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 	};
@@ -382,7 +382,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu4_emerg0: cpu4-emerg0-cfg {
@@ -413,7 +413,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu4_emerg1: cpu4-emerg1-cfg {
@@ -444,7 +444,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu5_emerg0: cpu5-emerg0-cfg {
@@ -482,7 +482,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu5_emerg1: cpu5-emerg1-cfg {
@@ -520,7 +520,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu6_emerg0: cpu6-emerg0-cfg {
@@ -558,7 +558,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu6_emerg1: cpu6-emerg1-cfg {
@@ -596,7 +596,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu7_emerg0: cpu7-emerg0-cfg {
@@ -634,7 +634,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu7_emerg1: cpu7-emerg1-cfg {
@@ -672,7 +672,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu7_emerg2: cpu7-emerg2-cfg {
@@ -710,7 +710,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			gpu0_tj_cfg: tj_cfg {
@@ -748,7 +748,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			gpu1_tj_cfg: tj_cfg {
@@ -805,7 +805,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu0_emerg: cpu0-emerg-cfg {
@@ -843,7 +843,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu1_emerg: cpu1-emerg-cfg {
@@ -881,7 +881,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu2_emerg: cpu2-emerg-cfg {
@@ -919,7 +919,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			cpu3_emerg: cpu3-emerg-cfg {
@@ -957,7 +957,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			nspss_0_config: junction-config {
@@ -996,7 +996,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			nspss_1_config: junction-config {
@@ -1035,7 +1035,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 
 			nspss_2_config: junction-config {
@@ -1093,7 +1093,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 
@@ -1143,7 +1143,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 
@@ -1201,7 +1201,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 
@@ -1259,7 +1259,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};
 
@@ -1317,7 +1317,7 @@
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
-				type = "critical";
+				type = "passive";
 			};
 		};