diff --git a/qcom/lahaina-thermal.dtsi b/qcom/lahaina-thermal.dtsi
index 933fdf203ac5..8be59cb4c62e 100644
--- a/qcom/lahaina-thermal.dtsi
+++ b/qcom/lahaina-thermal.dtsi
@@ -778,6 +778,12 @@
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			cpu00_config1: cpu00-config1 {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -785,6 +791,17 @@
 				trip = <&cpu00_config>;
 				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>;
+			};
 		};
 	};
 
@@ -799,6 +816,12 @@
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			cpu01_config1: cpu01-config1 {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -806,6 +829,17 @@
 				trip = <&cpu01_config>;
 				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>;
+			};
 		};
 	};
 
@@ -820,6 +854,12 @@
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			cpu02_config1: cpu02-config1 {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -827,6 +867,17 @@
 				trip = <&cpu02_config>;
 				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>;
+			};
 		};
 	};
 
@@ -841,6 +892,12 @@
 				hysteresis = <10000>;
 				type = "passive";
 			};
+
+			cpu03_config1: cpu03-config1 {
+				temperature = <112000>;
+				hysteresis = <12000>;
+				type = "passive";
+			};
 		};
 
 		cooling-maps {
@@ -848,6 +905,17 @@
 				trip = <&cpu03_config>;
 				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>;
+			};
 		};
 	};
 
@@ -858,6 +926,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu10_config: cpu10-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu10_config1: cpu10-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -875,6 +949,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu10_cdev2 {
+				trip = <&cpu10_config1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -885,6 +964,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu11_config: cpu11-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu11_config1: cpu11-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -902,6 +987,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu11_cdev2 {
+				trip = <&cpu11_config1>;
+				cooling-device = <&cpu4_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -912,6 +1002,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu12_config: cpu12-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu12_config1: cpu12-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -929,6 +1025,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu12_cdev2 {
+				trip = <&cpu12_config1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -939,6 +1040,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu13_config: cpu13-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu13_config1: cpu13-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -956,6 +1063,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu13_cdev2 {
+				trip = <&cpu13_config1>;
+				cooling-device = <&cpu5_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -966,6 +1078,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu14_config: cpu14-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu14_config1: cpu14-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -983,6 +1101,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu14_cdev2 {
+				trip = <&cpu14_config1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -993,6 +1116,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu15_config: cpu15-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu15_config1: cpu15-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -1010,6 +1139,11 @@
 				cooling-device = <&CPU4 THERMAL_MAX_LIMIT
 							THERMAL_MAX_LIMIT>;
 			};
+
+			cpu15_cdev2 {
+				trip = <&cpu15_config1>;
+				cooling-device = <&cpu6_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -1020,6 +1154,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu16_config: cpu16-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu16_config1: cpu16-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -1031,6 +1171,17 @@
 				trip = <&cpu16_config>;
 				cooling-device = <&cpu7_isolate 1 1>;
 			};
+
+			cpu16_cdev1 {
+				trip = <&cpu16_config>;
+				cooling-device = <&CPU7 THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+
+			cpu16_cdev2 {
+				trip = <&cpu16_config1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
 		};
 	};
 
@@ -1041,6 +1192,12 @@
 		thermal-governor = "step_wise";
 		trips {
 			cpu17_config: cpu17-config {
+				temperature = <108000>;
+				hysteresis = <8000>;
+				type = "passive";
+			};
+
+			cpu17_config1: cpu17-config1 {
 				temperature = <110000>;
 				hysteresis = <10000>;
 				type = "passive";
@@ -1052,6 +1209,17 @@
 				trip = <&cpu17_config>;
 				cooling-device = <&cpu7_isolate 1 1>;
 			};
+
+			cpu17_cdev1 {
+				trip = <&cpu17_config>;
+				cooling-device = <&CPU7 THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
+			};
+
+			cpu17_cdev2 {
+				trip = <&cpu17_config1>;
+				cooling-device = <&cpu7_hotplug 1 1>;
+			};
 		};
 	};