diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
index cdc3977daa5c4..951390fa2510e 100644
--- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
+++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts
@@ -1244,340 +1244,6 @@
 	};
 };
 
-&thermal_zones {
-	cpu0-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu1-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu2-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu3-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu4-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu5-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu6-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu7-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu8-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu9-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu10-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	cpu11-thermal {
-		trips {
-			/delete-node/ trip-point0;
-			/delete-node/ trip-point1;
-
-			cpu-crit {
-				temperature = <115000>;
-			};
-		};
-
-		/delete-node/ cooling-maps;
-	};
-
-	aoss0-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			aoss0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	aoss1-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			aoss1-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	cpuss0-thermal {
-		trips {
-			/delete-node/ trip-point0;
-
-			cluster0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	cpuss1-thermal {
-		trips {
-			/delete-node/ trip-point0;
-
-			cluster0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	gpuss0-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			gpuss0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	gpuss1-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			gpuss1-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	nspss0-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			nspss0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	nspss1-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			nspss1-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	video-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			video-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	ddr-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			ddr-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	mdmss0-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			mdmss0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	mdmss1-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			mdmss1-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	mdmss2-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			mdmss2-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	mdmss3-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			mdmss3-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-
-	camera0-thermal {
-		trips {
-			trip-point0 {
-				temperature = <105000>;
-			};
-
-			camera0-crit {
-				temperature = <115000>;
-			};
-		};
-	};
-};
-
 &tlmm {
 	gpio-reserved-ranges = <32 2>, /* ADSP */
 			       <48 4>; /* NFC */