diff --git a/qcom/shima-thermal-overlay.dtsi b/qcom/shima-thermal-overlay.dtsi
index aa352a783037..e2f347492c47 100644
--- a/qcom/shima-thermal-overlay.dtsi
+++ b/qcom/shima-thermal-overlay.dtsi
@@ -49,6 +49,11 @@
 				trip = <&b_bcl_lvl0>;
 				cooling-device = <&msm_gpu 2 2>;
 			};
+
+			vbat_cdsp0 {
+				trip = <&b_bcl_lvl0>;
+				cooling-device = <&cdsp_sw 2 2>;
+			};
 		};
 	};
 
@@ -68,6 +73,11 @@
 				trip = <&b_bcl_lvl1>;
 				cooling-device = <&msm_gpu 4 4>;
 			};
+
+			vbat_cdsp1 {
+				trip = <&b_bcl_lvl1>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
 		};
 	};
 
@@ -78,6 +88,12 @@
 				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			vbat_cdsp2 {
+				trip = <&b_bcl_lvl2>;
+				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
 		};
 	};
 
@@ -98,6 +114,11 @@
 				trip = <&c_bcl_lvl0>;
 				cooling-device = <&msm_gpu 2 2>;
 			};
+
+			vph_cdsp0 {
+				trip = <&c_bcl_lvl0>;
+				cooling-device = <&cdsp_sw 2 2>;
+			};
 		};
 	};
 
@@ -118,6 +139,11 @@
 				trip = <&c_bcl_lvl1>;
 				cooling-device = <&msm_gpu 4 4>;
 			};
+
+			vph_cdsp1 {
+				trip = <&c_bcl_lvl1>;
+				cooling-device = <&cdsp_sw 4 4>;
+			};
 		};
 	};
 
@@ -129,6 +155,12 @@
 				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			vph_cdsp2 {
+				trip = <&c_bcl_lvl2>;
+				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
 		};
 	};
 
@@ -151,27 +183,6 @@
 							THERMAL_MAX_LIMIT>;
 			};
 
-			pm8350_cpu0_freq {
-				trip = <&pm8350_trip0>;
-				cooling-device = <&CPU0 THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
-			pm8350_cpu1 {
-				trip = <&pm8350_trip0>;
-				cooling-device = <&cpu1_isolate 1 1>;
-			};
-
-			pm8350_cpu2 {
-				trip = <&pm8350_trip0>;
-				cooling-device = <&cpu2_isolate 1 1>;
-			};
-
-			pm8350_cpu3 {
-				trip = <&pm8350_trip0>;
-				cooling-device = <&cpu3_isolate 1 1>;
-			};
-
 			pm8350_cpu4 {
 				trip = <&pm8350_trip0>;
 				cooling-device = <&cpu4_isolate 1 1>;
diff --git a/qcom/shima-thermal.dtsi b/qcom/shima-thermal.dtsi
index fe9edb42f5c3..8d8dacd4cef4 100644
--- a/qcom/shima-thermal.dtsi
+++ b/qcom/shima-thermal.dtsi
@@ -834,12 +834,6 @@
 				cooling-device = <&cpu0_isolate 1 1>;
 			};
 
-			cpu00_cdev1 {
-				trip = <&cpu00_config>;
-				cooling-device = <&CPU0 THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
 			cpu00_cdev2 {
 				trip = <&cpu00_config1>;
 				cooling-device = <&cpu0_hotplug 1 1>;
@@ -872,12 +866,6 @@
 				cooling-device = <&cpu1_isolate 1 1>;
 			};
 
-			cpu01_cdev1 {
-				trip = <&cpu01_config>;
-				cooling-device = <&CPU0 THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
 			cpu01_cdev2 {
 				trip = <&cpu01_config1>;
 				cooling-device = <&cpu1_hotplug 1 1>;
@@ -910,12 +898,6 @@
 				cooling-device = <&cpu2_isolate 1 1>;
 			};
 
-			cpu02_cdev1 {
-				trip = <&cpu02_config>;
-				cooling-device = <&CPU0 THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
 			cpu02_cdev2 {
 				trip = <&cpu02_config1>;
 				cooling-device = <&cpu2_hotplug 1 1>;
@@ -948,12 +930,6 @@
 				cooling-device = <&cpu3_isolate 1 1>;
 			};
 
-			cpu03_cdev1 {
-				trip = <&cpu03_config>;
-				cooling-device = <&CPU0 THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
-			};
-
 			cpu03_cdev2 {
 				trip = <&cpu03_config1>;
 				cooling-device = <&cpu3_hotplug 1 1>;