diff --git a/qcom/shima-qrd.dtsi b/qcom/shima-qrd.dtsi
index ea9a65cd8f39..3c4d58ff97f2 100644
--- a/qcom/shima-qrd.dtsi
+++ b/qcom/shima-qrd.dtsi
@@ -197,6 +197,99 @@
 	qcom,wireless-fw-name = "idt9412.bin";
 };
 
+&thermal_zones {
+	quiet-therm-step {
+		polling-delay-passive = <2000>;
+		polling-delay = <0>;
+		thermal-governor = "step_wise";
+		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM1_100K_PU>;
+
+		trips {
+			quiet_gpu_trip: quiet-gpu-trip {
+				temperature = <45000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			quiet_cpu4_trip: quiet-cpu4-trip {
+				temperature = <46000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			quiet_cpu7_trip: quiet-cpu7-trip {
+				temperature = <48000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			quiet_cpu0_trip: quiet-cpu0-trip {
+				temperature = <50000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+
+			quiet_cx_trip: quiet-cx-trip {
+				temperature = <55000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			gpu-cdev0 {
+				trip = <&quiet_gpu_trip>;
+				/* throttle to 443000000Hz */
+				cooling-device = <&msm_gpu THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-1)>;
+			};
+
+			gpu-cdev1 {
+				trip = <&quiet_cx_trip>;
+				/* throttle to 285000000Hz */
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+						THERMAL_MAX_LIMIT>;
+			};
+
+			cpufreq0-cdev {
+				trip = <&quiet_cpu0_trip>;
+				/* throttle to 1516800KHz */
+				cooling-device = <&CPU0 THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-7)>;
+			};
+
+			cpufreq4-cdev {
+				trip = <&quiet_cpu4_trip>;
+				/* throttle to 1651200KHz */
+				cooling-device = <&CPU4 THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-5)>;
+			};
+
+			cpufreq7-cdev {
+				trip = <&quiet_cpu7_trip>;
+				/* throttle to 1862400KHz */
+				cooling-device = <&CPU7 THERMAL_NO_LIMIT
+						(THERMAL_MAX_LIMIT-5)>;
+			};
+
+			cdsp-cdev {
+				trip = <&quiet_cx_trip>;
+				cooling-device = <&cdsp_sw 5 5>;
+			};
+
+			modem-pa-cdev {
+				trip = <&quiet_cx_trip>;
+				cooling-device = <&modem_pa 3 3>;
+			};
+
+			modem-tj-cdev {
+				trip = <&quiet_cx_trip>;
+				cooling-device = <&modem_tj 3 3>;
+			};
+		};
+	};
+};
+
 &qupv3_se10_i2c {
 	#address-cells = <1>;
 	#size-cells = <0>;
diff --git a/qcom/shima-thermal.dtsi b/qcom/shima-thermal.dtsi
index abf3371998fc..73aa20666ae0 100644
--- a/qcom/shima-thermal.dtsi
+++ b/qcom/shima-thermal.dtsi
@@ -1254,18 +1254,12 @@
 	};
 
 	nspss-0-step {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&tsens1 3>;
 		trips {
-			nspss0_trip0: nspss0-trip0 {
-				temperature = <95000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			nspss0_trip1: nspss0-trip1 {
+			nspss0_trip: nspss0-trip {
 				temperature = <100000>;
 				hysteresis = <5000>;
 				type = "passive";
@@ -1273,49 +1267,37 @@
 		};
 
 		cooling-maps {
-			cdsp-cdev0 {
-				trip = <&nspss0_trip0>;
-				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
-							THERMAL_NO_LIMIT>;
-			};
-
-			cdsp-cdev1 {
-				trip = <&nspss0_trip1>;
-				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
+			cdsp-cdev {
+				trip = <&nspss0_trip>;
+				cooling-device = <&cdsp_sw 5 5>;
 			};
 
 			gpu_cdev {
-				trip = <&nspss0_trip1>;
-				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-1)
-							(THERMAL_MAX_LIMIT-1)>;
+				trip = <&nspss0_trip>;
+				/* throttle to 285000000Hz */
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
 			};
 
 			modem-pa-cdev {
-				trip = <&nspss0_trip1>;
+				trip = <&nspss0_trip>;
 				cooling-device = <&modem_pa 3 3>;
 			};
 
 			modem-tj-cdev {
-				trip = <&nspss0_trip1>;
+				trip = <&nspss0_trip>;
 				cooling-device = <&modem_tj 3 3>;
 			};
 		};
 	};
 
 	nspss-1-step {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&tsens1 4>;
 		trips {
-			nspss1_trip0: nspss1-trip0 {
-				temperature = <95000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			nspss1_trip1: nspss1-trip1 {
+			nspss1_trip: nspss1-trip {
 				temperature = <100000>;
 				hysteresis = <5000>;
 				type = "passive";
@@ -1323,49 +1305,37 @@
 		};
 
 		cooling-maps {
-			cdsp-cdev0 {
-				trip = <&nspss1_trip0>;
-				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
-							THERMAL_NO_LIMIT>;
-			};
-
-			cdsp-cdev1 {
-				trip = <&nspss1_trip1>;
-				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
+			cdsp-cdev {
+				trip = <&nspss1_trip>;
+				cooling-device = <&cdsp_sw 5 5>;
 			};
 
 			gpu_cdev {
-				trip = <&nspss1_trip1>;
-				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-1)
-							(THERMAL_MAX_LIMIT-1)>;
+				trip = <&nspss1_trip>;
+				/* throttle to 285000000Hz */
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
 			};
 
 			modem-pa-cdev {
-				trip = <&nspss1_trip1>;
+				trip = <&nspss1_trip>;
 				cooling-device = <&modem_pa 3 3>;
 			};
 
 			modem-tj-cdev {
-				trip = <&nspss1_trip1>;
+				trip = <&nspss1_trip>;
 				cooling-device = <&modem_tj 3 3>;
 			};
 		};
 	};
 
 	nspss-2-step {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&tsens1 5>;
 		trips {
-			nspss2_trip0: nspss2-trip0 {
-				temperature = <95000>;
-				hysteresis = <0>;
-				type = "passive";
-			};
-
-			nspss2_trip1: nspss2-trip1 {
+			nspss2_trip: nspss2-trip {
 				temperature = <100000>;
 				hysteresis = <5000>;
 				type = "passive";
@@ -1373,34 +1343,27 @@
 		};
 
 		cooling-maps {
-			cdsp-cdev0 {
-				trip = <&nspss2_trip0>;
-				cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
-							THERMAL_NO_LIMIT>;
-			};
-
-			cdsp-cdev1 {
-				trip = <&nspss2_trip1>;
-				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
-							THERMAL_MAX_LIMIT>;
+			cdsp-cdev {
+				trip = <&nspss2_trip>;
+				cooling-device = <&cdsp_sw 5 5>;
 			};
 
 			gpu_cdev {
-				trip = <&nspss2_trip1>;
-				cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-1)
-							(THERMAL_MAX_LIMIT-1)>;
+				trip = <&nspss2_trip>;
+				/* throttle to 285000000Hz */
+				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
+							THERMAL_MAX_LIMIT>;
 			};
 
 			modem-pa-cdev {
-				trip = <&nspss2_trip1>;
+				trip = <&nspss2_trip>;
 				cooling-device = <&modem_pa 3 3>;
 			};
 
 			modem-tj-cdev {
-				trip = <&nspss2_trip1>;
+				trip = <&nspss2_trip>;
 				cooling-device = <&modem_tj 3 3>;
 			};
 		};
 	};
 };
-