diff --git a/qcom/kalama-thermal.dtsi b/qcom/kalama-thermal.dtsi
index db8a74e4..1b8cf821 100644
--- a/qcom/kalama-thermal.dtsi
+++ b/qcom/kalama-thermal.dtsi
@@ -205,7 +205,7 @@
 		cdsp {
 			qcom,instance-id = <QMI_CDSP_INST_ID>;
 
-			cdsp_sw: cdsp_kr {
+			cdsp_sw: cdsp {
 				qcom,qmi-dev-name = "cdsp_sw";
 				#cooling-cells = <2>;
 			};
@@ -370,6 +370,12 @@
 			};
 
 			cpu3_emerg0: cpu3-emerg0-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu3_emerg0_1: cpu3-emerg0-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -387,6 +393,11 @@
 				trip = <&cpu3_emerg0>;
 				cooling-device = <&cpu3_pause 1 1>;
 			};
+
+			cpu10_cdev1 {
+				trip = <&cpu3_emerg0_1>;
+				cooling-device = <&cpu3_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -408,6 +419,12 @@
 			};
 
 			cpu3_emerg1: cpu3-emerg1-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu3_emerg1_1: cpu3-emerg1-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -425,6 +442,11 @@
 				trip = <&cpu3_emerg1>;
 				cooling-device = <&cpu3_pause 1 1>;
 			};
+
+			cpu11_cdev1 {
+				trip = <&cpu3_emerg1_1>;
+				cooling-device = <&cpu3_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -446,6 +468,12 @@
 			};
 
 			cpu4_emerg0: cpu4-emerg0-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu4_emerg0_1: cpu4-emerg0-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -463,6 +491,11 @@
 				trip = <&cpu4_emerg0>;
 				cooling-device = <&cpu4_pause 1 1>;
 			};
+
+			cpu12_cdev1 {
+				trip = <&cpu4_emerg0_1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -484,6 +517,12 @@
 			};
 
 			cpu4_emerg1: cpu4-emerg1-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu4_emerg1_1: cpu4-emerg1-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -501,6 +540,11 @@
 				trip = <&cpu4_emerg1>;
 				cooling-device = <&cpu4_pause 1 1>;
 			};
+
+			cpu13_cdev1 {
+				trip = <&cpu4_emerg1_1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -522,6 +566,12 @@
 			};
 
 			cpu5_emerg0: cpu5-emerg0-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu5_emerg0_1: cpu5-emerg0-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -539,6 +589,11 @@
 				trip = <&cpu5_emerg0>;
 				cooling-device = <&cpu5_pause 1 1>;
 			};
+
+			cpu14_cdev1 {
+				trip = <&cpu5_emerg0_1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -560,6 +615,12 @@
 			};
 
 			cpu5_emerg1: cpu5-emerg1-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu5_emerg1_1: cpu5-emerg1-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -577,6 +638,11 @@
 				trip = <&cpu5_emerg1>;
 				cooling-device = <&cpu5_pause 1 1>;
 			};
+
+			cpu15_cdev1 {
+				trip = <&cpu5_emerg1_1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -598,6 +664,12 @@
 			};
 
 			cpu6_emerg0: cpu6-emerg0-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu6_emerg0_1: cpu6-emerg0-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -615,6 +687,11 @@
 				trip = <&cpu6_emerg0>;
 				cooling-device = <&cpu6_pause 1 1>;
 			};
+
+			cpu16_cdev1 {
+				trip = <&cpu6_emerg0_1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -636,6 +713,12 @@
 			};
 
 			cpu6_emerg1: cpu6-emerg1-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu6_emerg1_1: cpu6-emerg1-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -653,6 +736,11 @@
 				trip = <&cpu6_emerg1>;
 				cooling-device = <&cpu6_pause 1 1>;
 			};
+
+			cpu17_cdev1 {
+				trip = <&cpu6_emerg1_1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -674,6 +762,12 @@
 			};
 
 			cpu7_emerg0: cpu7-emerg0-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu7_emerg0_1: cpu7-emerg0-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -691,6 +785,11 @@
 				trip = <&cpu7_emerg0>;
 				cooling-device = <&cpu7_pause 1 1>;
 			};
+
+			cpu18_cdev1 {
+				trip = <&cpu7_emerg0_1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -712,6 +811,12 @@
 			};
 
 			cpu7_emerg1: cpu7-emerg1-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu7_emerg1_1: cpu7-emerg1-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -729,6 +834,11 @@
 				trip = <&cpu7_emerg1>;
 				cooling-device = <&cpu7_pause 1 1>;
 			};
+
+			cpu19_cdev1 {
+				trip = <&cpu7_emerg1_1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -750,6 +860,12 @@
 			};
 
 			cpu7_emerg2: cpu7-emerg2-cfg {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu7_emerg2_1: cpu7-emerg2-1-cfg {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -767,6 +883,11 @@
 				trip = <&cpu7_emerg2>;
 				cooling-device = <&cpu7_pause 1 1>;
 			};
+
+			cpu110_cdev1 {
+				trip = <&cpu7_emerg2_1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -837,6 +958,12 @@
 				type = "passive";
 			};
 
+			cpu1_emerg1: cpu1-emerg1-cfg {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
@@ -849,6 +976,11 @@
 				trip = <&cpu1_emerg>;
 				cooling-device = <&cpu1_pause 1 1>;
 			};
+
+			cpu01_cdev1 {
+				trip = <&cpu1_emerg1>;
+				cooling-device = <&cpu1_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -875,6 +1007,12 @@
 				type = "passive";
 			};
 
+			cpu2_emerg1: cpu2-emerg1-cfg {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
@@ -887,6 +1025,11 @@
 				trip = <&cpu2_emerg>;
 				cooling-device = <&cpu2_pause 1 1>;
 			};
+
+			cpu02_cdev1 {
+				trip = <&cpu2_emerg1>;
+				cooling-device = <&cpu2_hotplug 1 1>;
+			};
 		};
 	};