diff --git a/qcom/sun-thermal.dtsi b/qcom/sun-thermal.dtsi
index 78f62b03..13393471 100644
--- a/qcom/sun-thermal.dtsi
+++ b/qcom/sun-thermal.dtsi
@@ -5,6 +5,10 @@
 
 #include <dt-bindings/thermal/thermal_qti.h>
 
+&msm_gpu {
+	#cooling-cells = <2>;
+};
+
 &soc {
 	tsens0: tsens0@c228000 {
 		compatible = "qcom,tsens-v2";
@@ -49,6 +53,11 @@
 		interrupt-names = "uplow","critical";
 		#thermal-sensor-cells = <1>;
 	};
+
+	qcom,devfreq-cdev {
+		compatible = "qcom,devfreq-cdev";
+		qcom,devfreq = <&msm_gpu>;
+	};
 };
 
 &thermal_zones {
@@ -1006,6 +1015,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu0_cdev {
+				trip = <&gpu0_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-1 {
@@ -1037,6 +1053,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu1_cdev {
+				trip = <&gpu1_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-2 {
@@ -1068,6 +1091,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu2_cdev {
+				trip = <&gpu2_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-3 {
@@ -1099,6 +1129,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu3_cdev {
+				trip = <&gpu3_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-4 {
@@ -1130,6 +1167,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu4_cdev {
+				trip = <&gpu4_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-5 {
@@ -1161,6 +1205,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu5_cdev {
+				trip = <&gpu5_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-6 {
@@ -1192,6 +1243,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu6_cdev {
+				trip = <&gpu6_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	gpuss-7 {
@@ -1223,6 +1281,13 @@
 				type = "passive";
 			};
 		};
+
+		cooling-maps {
+			gpu7_cdev {
+				trip = <&gpu7_tj_cfg>;
+				cooling-device = <&msm_gpu 0 THERMAL_NO_LIMIT>;
+			};
+		};
 	};
 
 	mdmss-0 {