diff --git a/qcom/sdxlemur-thermal.dtsi b/qcom/sdxlemur-thermal.dtsi
index 5c9bfecf239a..5ca372177e6d 100644
--- a/qcom/sdxlemur-thermal.dtsi
+++ b/qcom/sdxlemur-thermal.dtsi
@@ -23,18 +23,39 @@
 		thermal-governor = "step_wise";
 		thermal-sensors = <&tsens0 1>;
 		trips {
-			cpu_config: active-config0 {
+			cpu_config0: active-config0 {
 				temperature = <95000>;
-				hysteresis = <0>;
+				hysteresis = <2000>;
+				type = "passive";
+			};
+
+			cpu_config1: active-config1 {
+				temperature = <97000>;
+				hysteresis = <3000>;
+				type = "passive";
+			};
+
+			cpu_config2: active-config2 {
+				temperature = <99000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 		};
 
 		cooling-maps {
-			cpu_cdev {
-				trip = <&cpu_config>;
-				cooling-device = <&CPU0 THERMAL_NO_LIMIT
-							THERMAL_NO_LIMIT>;
+			cpu_cdev0 {
+				trip = <&cpu_config0>;
+				cooling-device = <&CPU0 1 1>;
+			};
+
+			cpu_cdev1 {
+				trip = <&cpu_config1>;
+				cooling-device = <&CPU0 2 2>;
+			};
+
+			cpu_cdev2 {
+				trip = <&cpu_config2>;
+				cooling-device = <&CPU0 3 THERMAL_NO_LIMIT>;
 			};
 		};
 	};
@@ -46,64 +67,16 @@
 		thermal-sensors = <&tsens0 3>;
 		trips {
 			mdmss0_config0: mdmss0-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss0_config1: mdmss0-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
-
-			mdmss0_config2: mdmss0-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			lte_cdev0 {
-				trip = <&mdmss0_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
-			};
-
-			nr_scg_cdev0 {
-				trip = <&mdmss0_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
-			};
-
-			nr_cdev0 {
-				trip = <&mdmss0_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
-			};
-
-			lte_cdev1 {
-				trip = <&mdmss0_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss0_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
-			};
-
-			nr_cdev1 {
-				trip = <&mdmss0_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss0_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss0_config2>;
-				cooling-device = <&modem_nr_dsc 255 255>;
-			};
 		};
 	};
 
@@ -114,20 +87,14 @@
 		thermal-sensors = <&tsens0 4>;
 		trips {
 			mdmss1_config0: mdmss1-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss1_config1: mdmss1-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
-			mdmss1_config2: mdmss1-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
 		};
@@ -135,41 +102,26 @@
 		cooling-maps {
 			lte_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
+				cooling-device = <&modem_lte_dsc 8 8>;
 			};
 
 			nr_scg_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
+				cooling-device = <&modem_nr_scg_dsc 10 10>;
 			};
 
 			nr_cdev0 {
 				trip = <&mdmss1_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
+				cooling-device = <&modem_nr_dsc 6 6>;
 			};
 
 			lte_cdev1 {
 				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
+				cooling-device = <&modem_lte_dsc 255 255>;
 			};
 
 			nr_cdev1 {
 				trip = <&mdmss1_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss1_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss1_config2>;
 				cooling-device = <&modem_nr_dsc 255 255>;
 			};
 		};
@@ -182,64 +134,16 @@
 		thermal-sensors = <&tsens0 5>;
 		trips {
 			mdmss2_config0: mdmss2-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss2_config1: mdmss2-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
-
-			mdmss2_config2: mdmss2-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-
-		cooling-maps {
-			lte_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
-			};
-
-			nr_scg_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
-			};
-
-			nr_cdev0 {
-				trip = <&mdmss2_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
-			};
-
-			lte_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
-			};
-
-			nr_cdev1 {
-				trip = <&mdmss2_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss2_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss2_config2>;
-				cooling-device = <&modem_nr_dsc 255 255>;
-			};
 		};
 	};
 
@@ -250,20 +154,14 @@
 		thermal-sensors = <&tsens0 6>;
 		trips {
 			mdmss3_config0: mdmss3-config0 {
-				temperature = <95000>;
-				hysteresis = <5000>;
+				temperature = <111000>;
+				hysteresis = <3000>;
 				type = "passive";
 			};
 
 			mdmss3_config1: mdmss3-config1 {
-				temperature = <100000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-
-			mdmss3_config2: mdmss3-config2 {
-				temperature = <105000>;
-				hysteresis = <5000>;
+				temperature = <115000>;
+				hysteresis = <2000>;
 				type = "passive";
 			};
 		};
@@ -271,41 +169,26 @@
 		cooling-maps {
 			lte_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_lte_dsc 7 7>;
+				cooling-device = <&modem_lte_dsc 8 8>;
 			};
 
 			nr_scg_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_nr_scg_dsc 2 2>;
+				cooling-device = <&modem_nr_scg_dsc 10 10>;
 			};
 
 			nr_cdev0 {
 				trip = <&mdmss3_config0>;
-				cooling-device = <&modem_nr_dsc 4 4>;
+				cooling-device = <&modem_nr_dsc 6 6>;
 			};
 
 			lte_cdev1 {
 				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_lte_dsc 8 8>;
-			};
-
-			nr_scg_cdev1 {
-				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_nr_scg_dsc 10 10>;
+				cooling-device = <&modem_lte_dsc 255 255>;
 			};
 
 			nr_cdev1 {
 				trip = <&mdmss3_config1>;
-				cooling-device = <&modem_nr_dsc 6 6>;
-			};
-
-			lte_cdev2 {
-				trip = <&mdmss3_config2>;
-				cooling-device = <&modem_lte_dsc 255 255>;
-			};
-
-			nr_cdev2 {
-				trip = <&mdmss3_config2>;
 				cooling-device = <&modem_nr_dsc 255 255>;
 			};
 		};