diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 718c24313c59..01ccf2ac3d7d 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -3555,13 +3555,6 @@ cpu0_alert0: trip-point0 {
 					type = "passive";
 				};
 
-				cpu0_warm: cpu-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
-
 				cpu0_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
@@ -3574,14 +3567,6 @@ map0 {
 					trip = <&cpu0_alert0>;
 					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&cpu0_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};
 
@@ -3598,13 +3583,6 @@ cpu1_alert0: trip-point0 {
 					type = "passive";
 				};
 
-				cpu1_warm: cpu-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
-
 				cpu1_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
@@ -3617,14 +3595,6 @@ map0 {
 					trip = <&cpu1_alert0>;
 					cooling-device = <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&cpu1_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};
 
@@ -3641,13 +3611,6 @@ cpu2_alert0: trip-point0 {
 					type = "passive";
 				};
 
-				cpu2_warm: cpu-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
-
 				cpu2_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
@@ -3660,14 +3623,6 @@ map0 {
 					trip = <&cpu2_alert0>;
 					cooling-device = <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&cpu2_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};
 
@@ -3684,13 +3639,6 @@ cpu3_alert0: trip-point0 {
 					type = "passive";
 				};
 
-				cpu3_warm: cpu-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
-
 				cpu3_crit: cpu_crit {
 					temperature = <110000>;
 					hysteresis = <2000>;
@@ -3703,14 +3651,6 @@ map0 {
 					trip = <&cpu3_alert0>;
 					cooling-device = <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&cpu3_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};
 
@@ -3726,13 +3666,6 @@ gpu1_alert0: trip-point0 {
 					hysteresis = <2000>;
 					type = "passive";
 				};
-
-				gpu1_warm: trip-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
 			};
 
 			cooling-maps {
@@ -3740,17 +3673,6 @@ map0 {
 					trip = <&gpu1_alert0>;
 					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&gpu1_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&pd_cx_cooling THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&pd_mx_cooling THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};
 
@@ -3766,13 +3688,6 @@ gpu2_alert0: trip-point0 {
 					hysteresis = <2000>;
 					type = "passive";
 				};
-
-				gpu2_warm: trip-warm {
-					temperature = <15000>;
-					hysteresis = <2000>;
-					type = "passive";
-					monitor-falling;
-				};
 			};
 
 			cooling-maps {
@@ -3780,17 +3695,6 @@ map0 {
 					trip = <&gpu2_alert0>;
 					cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				};
-
-				map1 {
-					trip = <&gpu2_warm>;
-					cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&CPU3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&pd_cx_cooling THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&pd_mx_cooling THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
 			};
 		};