diff --git a/qcom/sa410m.dtsi b/qcom/sa410m.dtsi
index 27502fa9..8362ac06 100644
--- a/qcom/sa410m.dtsi
+++ b/qcom/sa410m.dtsi
@@ -479,28 +479,12 @@
 #include "scuba-thermal.dtsi"
 
 &thermal_zones {
-	gpu {
-		trips {
-			gpu-cxip-trip {
-				temperature = <105000>;
-			};
-
-			gpu-trip {
-				temperature = <105000>;
-			};
-
-			gpu-cx-mon {
-				temperature = <115000>;
-			};
-		};
-
-		cooling-maps {
-			/delete-node/ gpu_cdev;
-			/delete-node/ gpu-cx-cdev0;
-		};
+	wlan {
+		thermal-sensors = <&tsens0 1>;
 	};
 
 	cpuss-0 {
+		thermal-sensors = <&tsens0 2>;
 		trips {
 			cpu-0-2-config {
 				temperature = <115000>;
@@ -509,6 +493,7 @@
 	};
 
 	cpuss-1 {
+		thermal-sensors = <&tsens0 3>;
 		trips {
 			cpu-1-3-configs {
 				temperature = <115000>;
@@ -517,6 +502,7 @@
 	};
 
 	mdm-0 {
+		thermal-sensors = <&tsens0 4>;
 		trips {
 			mdm0-cx-mon {
 				temperature = <105000>;
@@ -545,6 +531,7 @@
 	};
 
 	mdm-1 {
+		thermal-sensors = <&tsens0 5>;
 		trips {
 			mdm1-cx-mon {
 				temperature = <105000>;
@@ -571,6 +558,17 @@
 			};
 		};
 	};
+
+	video {
+		thermal-sensors = <&tsens0 6>;
+	};
+
+	hm-center {
+		thermal-sensors = <&tsens0 7>;
+	};
+
+	/delete-node/ gpu;
+	/delete-node/ camera;
 };
 
 #include "msm-arm-smmu-sa410m.dtsi"