diff --git a/qcom/waipio-thermal.dtsi b/qcom/waipio-thermal.dtsi
index 6ddb9326..5bfa0b89 100644
--- a/qcom/waipio-thermal.dtsi
+++ b/qcom/waipio-thermal.dtsi
@@ -1,3 +1,9 @@
+#include <dt-bindings/thermal/thermal_qti.h>
+
+&msm_gpu {
+	#cooling-cells = <2>;
+};
+
 &soc {
 	tsens0: thermal-sensor@c263000 {
 		compatible = "qcom,tsens-v2";
@@ -255,11 +261,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu4_emerg0: cpu4-emerg0-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu10_cdev {
+				trip = <&cpu4_emerg0>;
+				cooling-device = <&cpu4_pause 1 1>;
+			};
 		};
 	};
 
@@ -274,11 +299,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu4_emerg1: cpu4-emerg1-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu11_cdev {
+				trip = <&cpu4_emerg1>;
+				cooling-device = <&cpu4_pause 1 1>;
+			};
 		};
 	};
 
@@ -293,11 +337,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu5_emerg0: cpu5-emerg0-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu12_cdev {
+				trip = <&cpu5_emerg0>;
+				cooling-device = <&cpu5_pause 1 1>;
+			};
 		};
 	};
 
@@ -312,11 +375,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu5_emerg1: cpu5-emerg1-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu13_cdev {
+				trip = <&cpu5_emerg1>;
+				cooling-device = <&cpu5_pause 1 1>;
+			};
 		};
 	};
 
@@ -331,11 +413,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu6_emerg0: cpu6-emerg0-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu14_cdev {
+				trip = <&cpu6_emerg0>;
+				cooling-device = <&cpu6_pause 1 1>;
+			};
 		};
 	};
 
@@ -350,11 +451,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu6_emerg1: cpu6-emerg1-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu15_cdev {
+				trip = <&cpu6_emerg1>;
+				cooling-device = <&cpu6_pause 1 1>;
+			};
 		};
 	};
 
@@ -369,11 +489,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu7_emerg0: cpu7-emerg0-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu16_cdev {
+				trip = <&cpu7_emerg0>;
+				cooling-device = <&cpu7_pause 1 1>;
+			};
 		};
 	};
 
@@ -388,11 +527,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu7_emerg1: cpu7-emerg1-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu17_cdev {
+				trip = <&cpu7_emerg1>;
+				cooling-device = <&cpu7_pause 1 1>;
+			};
 		};
 	};
 
@@ -407,16 +565,35 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu7_emerg2: cpu7-emerg2-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu18_cdev {
+				trip = <&cpu7_emerg2>;
+				cooling-device = <&cpu7_pause 1 1>;
+			};
 		};
 	};
 
 	gpuss-0 {
-		polling-delay-passive = <0>;
+		polling-delay-passive = <10>;
 		polling-delay = <0>;
 		thermal-sensors = <&tsens0 14>;
 		trips {
@@ -426,20 +603,7 @@
 				type = "passive";
 			};
 
-			reset-mon-cfg {
-				temperature = <115000>;
-				hysteresis = <5000>;
-				type = "passive";
-			};
-		};
-	};
-
-	gpuss-1 {
-		polling-delay-passive = <0>;
-		polling-delay = <0>;
-		thermal-sensors = <&tsens0 15>;
-		trips {
-			thermal-engine-config {
+			thermal-hal-config {
 				temperature = <125000>;
 				hysteresis = <1000>;
 				type = "passive";
@@ -450,6 +614,57 @@
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			gpu0_tj_cfg: tj_cfg {
+				temperature = <95000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			gpu0_cdev {
+				trip = <&gpu0_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
+	};
+
+	gpuss-1 {
+		polling-delay-passive = <10>;
+		polling-delay = <0>;
+		thermal-sensors = <&tsens0 15>;
+		trips {
+			thermal-engine-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
+			reset-mon-cfg {
+				temperature = <115000>;
+				hysteresis = <5000>;
+				type = "passive";
+			};
+
+			gpu1_tj_cfg: tj_cfg {
+				temperature = <95000>;
+				hysteresis = <0>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			gpu1_cdev {
+				trip = <&gpu1_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
 		};
 	};
 
@@ -483,11 +698,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu0_emerg: cpu0-emerg-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu00_cdev {
+				trip = <&cpu0_emerg>;
+				cooling-device = <&cpu0_pause 1 1>;
+			};
 		};
 	};
 
@@ -502,11 +736,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu1_emerg: cpu1-emerg-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu01_cdev {
+				trip = <&cpu1_emerg>;
+				cooling-device = <&cpu1_pause 1 1>;
+			};
 		};
 	};
 
@@ -521,11 +774,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu2_emerg: cpu2-emerg-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu02_cdev {
+				trip = <&cpu2_emerg>;
+				cooling-device = <&cpu2_pause 1 1>;
+			};
 		};
 	};
 
@@ -540,11 +812,30 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
 				type = "passive";
 			};
+
+			cpu3_emerg: cpu3-emerg-cfg {
+				temperature = <110000>;
+				hysteresis = <10000>;
+				type = "passive";
+			};
+		};
+
+		cooling-maps {
+			cpu03_cdev {
+				trip = <&cpu3_emerg>;
+				cooling-device = <&cpu3_pause 1 1>;
+			};
 		};
 	};
 
@@ -559,6 +850,12 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
@@ -578,6 +875,12 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
@@ -597,6 +900,12 @@
 				type = "passive";
 			};
 
+			thermal-hal-config {
+				temperature = <125000>;
+				hysteresis = <1000>;
+				type = "passive";
+			};
+
 			reset-mon-cfg {
 				temperature = <115000>;
 				hysteresis = <5000>;
diff --git a/qcom/waipio.dtsi b/qcom/waipio.dtsi
index a76011a6..166fb024 100644
--- a/qcom/waipio.dtsi
+++ b/qcom/waipio.dtsi
@@ -3170,8 +3170,8 @@
 #include "waipio-audio.dtsi"
 #include "waipio-pcie.dtsi"
 #include "msm-rdbg.dtsi"
-#include "waipio-thermal.dtsi"
 #include "waipio-gpu.dtsi"
+#include "waipio-thermal.dtsi"
 
 &pcie0_rp {
 	#address-cells = <5>;