diff --git a/qcom/pm8550.dtsi b/qcom/pm8550.dtsi
index db70a612..59e97e28 100644
--- a/qcom/pm8550.dtsi
+++ b/qcom/pm8550.dtsi
@@ -213,7 +213,7 @@
 	};
 
 	pm8550-bcl-lvl0 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8550_bcl 5>;
@@ -228,7 +228,7 @@
 	};
 
 	pm8550-bcl-lvl1 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8550_bcl 6>;
@@ -243,7 +243,7 @@
 	};
 
 	pm8550-bcl-lvl2 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-governor = "step_wise";
 		thermal-sensors = <&pm8550_bcl 7>;
diff --git a/qcom/pmih010x.dtsi b/qcom/pmih010x.dtsi
index fce2bdf1..6f31c3c3 100644
--- a/qcom/pmih010x.dtsi
+++ b/qcom/pmih010x.dtsi
@@ -341,7 +341,7 @@
 	};
 
 	pmih010x-bcl-lvl0 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-sensors = <&pmih010x_bcl 5>;
 
@@ -367,7 +367,7 @@
 	};
 
 	pmih010x-bcl-lvl1 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-sensors = <&pmih010x_bcl 6>;
 
@@ -393,7 +393,7 @@
 	};
 
 	pmih010x-bcl-lvl2 {
-		polling-delay-passive = <100>;
+		polling-delay-passive = <50>;
 		polling-delay = <0>;
 		thermal-sensors = <&pmih010x_bcl 7>;
 
diff --git a/qcom/sun-pmic-overlay.dtsi b/qcom/sun-pmic-overlay.dtsi
index 142c256a..00fbd601 100644
--- a/qcom/sun-pmic-overlay.dtsi
+++ b/qcom/sun-pmic-overlay.dtsi
@@ -342,7 +342,7 @@
 
 &thermal_zones {
 	sys-therm-0 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <5000>;
 		polling-delay = <0>;
 		thermal-sensors = <&pmk8550_vadc PMK8550_ADC5_GEN3_AMUX_THM1_XO_THERM_100K_PU>;
 		trips {
diff --git a/qcom/sun-thermal.dtsi b/qcom/sun-thermal.dtsi
index b3676843..3ad8b018 100644
--- a/qcom/sun-thermal.dtsi
+++ b/qcom/sun-thermal.dtsi
@@ -317,7 +317,7 @@
 	};
 
 	cpu-0-0-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 1>;
 		trips {
@@ -366,7 +366,7 @@
 	};
 
 	cpu-0-0-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 2>;
 		trips {
@@ -415,7 +415,7 @@
 	};
 
 	cpu-0-1-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 3>;
 		trips {
@@ -464,7 +464,7 @@
 	};
 
 	cpu-0-1-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 4>;
 		trips {
@@ -513,7 +513,7 @@
 	};
 
 	cpu-0-2-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 5>;
 		trips {
@@ -562,7 +562,7 @@
 	};
 
 	cpu-0-2-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 6>;
 		trips {
@@ -611,7 +611,7 @@
 	};
 
 	cpu-0-3-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 7>;
 		trips {
@@ -660,7 +660,7 @@
 	};
 
 	cpu-0-3-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 8>;
 		trips {
@@ -709,7 +709,7 @@
 	};
 
 	cpu-0-4-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 9>;
 		trips {
@@ -758,7 +758,7 @@
 	};
 
 	cpu-0-4-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 10>;
 		trips {
@@ -807,7 +807,7 @@
 	};
 
 	cpu-0-5-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 11>;
 		trips {
@@ -856,7 +856,7 @@
 	};
 
 	cpu-0-5-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 12>;
 		trips {
@@ -962,7 +962,7 @@
 	};
 
 	cpu-1-0-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 1>;
 		trips {
@@ -1011,7 +1011,7 @@
 	};
 
 	cpu-1-0-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 2>;
 		trips {
@@ -1060,7 +1060,7 @@
 	};
 
 	cpu-1-1-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 3>;
 		trips {
@@ -1109,7 +1109,7 @@
 	};
 
 	cpu-1-1-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 4>;
 		trips {
@@ -1196,7 +1196,7 @@
 	};
 
 	nsphvx-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 7>;
 		trips {
@@ -1221,7 +1221,7 @@
 	};
 
 	nsphvx-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 8>;
 		trips {
@@ -1246,7 +1246,7 @@
 	};
 
 	nsphvx-2 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 9>;
 		trips {
@@ -1271,7 +1271,7 @@
 	};
 
 	nsphmx-0 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 10>;
 		trips {
@@ -1296,7 +1296,7 @@
 	};
 
 	nsphmx-1 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 11>;
 		trips {
@@ -1321,7 +1321,7 @@
 	};
 
 	nsphmx-2 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 12>;
 		trips {
@@ -1346,7 +1346,7 @@
 	};
 
 	nsphmx-3 {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 13>;
 		trips {
@@ -1371,7 +1371,7 @@
 	};
 
 	ddr {
-		polling-delay-passive = <10>;
+		polling-delay-passive = <0>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens1 14>;
 		trips {
@@ -1726,7 +1726,7 @@
 	};
 
 	mdmss-0 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <100>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens2 9>;
 		trips {
@@ -1790,7 +1790,7 @@
 	};
 
 	mdmss-1 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <100>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens2 10>;
 		trips {
@@ -1854,7 +1854,7 @@
 	};
 
 	mdmss-2 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <100>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens2 11>;
 		trips {
@@ -1918,7 +1918,7 @@
 	};
 
 	mdmss-3 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <100>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens2 12>;
 		trips {