diff --git a/qcom/holi-regulators-pm6125.dtsi b/qcom/holi-regulators-pm6125.dtsi
index 652065155f87..e5f25c6397f4 100644
--- a/qcom/holi-regulators-pm6125.dtsi
+++ b/qcom/holi-regulators-pm6125.dtsi
@@ -74,10 +74,6 @@
 		regulator-s3-level-ao {
 			status = "disabled";
 		};
-
-		gfx-cdev {
-			status = "disabled";
-		};
 	};
 
 	/* Disable mx_cdev for PM6150A */
@@ -434,16 +430,6 @@
 					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,use-voltage-level;
 		};
-
-		gfx_cdev: gfx-cdev {
-			status = "okay";
-			compatible = "qcom,regulator-cooling-device";
-			regulator-cdev-supply = <&S8A_LEVEL_AO>;
-			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_NONE
-					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
-			#cooling-cells = <2>;
-		};
-
 	};
 
 	/* VDD_LPI_CX supply */
diff --git a/qcom/holi-regulators-pm6350.dtsi b/qcom/holi-regulators-pm6350.dtsi
index 179cd8900a8f..c0679f636d22 100644
--- a/qcom/holi-regulators-pm6350.dtsi
+++ b/qcom/holi-regulators-pm6350.dtsi
@@ -50,14 +50,6 @@
 					<RPM_SMD_REGULATOR_LEVEL_BINNING>;
 			qcom,use-voltage-level;
 		};
-
-		gfx_cdev: gfx-cdev {
-			compatible = "qcom,regulator-cooling-device";
-			regulator-cdev-supply = <&S3A_LEVEL_AO>;
-			regulator-levels = <RPM_SMD_REGULATOR_LEVEL_RETENTION
-					RPM_SMD_REGULATOR_LEVEL_SVS_PLUS>;
-			#cooling-cells = <2>;
-		};
 	};
 
 	/* PM6350 L1 - VDD_MX supply */
diff --git a/qcom/holi-thermal.dtsi b/qcom/holi-thermal.dtsi
index 958f6b7d74b7..2ba52043e83f 100644
--- a/qcom/holi-thermal.dtsi
+++ b/qcom/holi-thermal.dtsi
@@ -72,6 +72,12 @@
 		#cooling-cells = <2>;
 		status = "disabled";
 	};
+
+	devfreq_vdd_cdev: devfreq-vdd-cdev {
+		compatible = "qcom,devfreq-vdd-cooling-device";
+		devfreq = <&msm_gpu>;
+		#cooling-cells = <2>;
+	};
 };
 
 &rpm_bus {
@@ -1167,9 +1173,9 @@
 				cooling-device = <&mx_cdev 1 1>;
 			};
 
-			gfx_vdd_cdev {
+			devfreq_vdd_cdev {
 				trip = <&zeroc_0_trip>;
-				cooling-device = <&gfx_cdev 1 1>;
+				cooling-device = <&devfreq_vdd_cdev 2 2>;
 			};
 
 			adsp_vdd_cdev {
@@ -1214,9 +1220,9 @@
 				cooling-device = <&mx_cdev 1 1>;
 			};
 
-			gfx_vdd_cdev {
+			devfreq_vdd_cdev {
 				trip = <&zeroc_1_trip>;
-				cooling-device = <&gfx_cdev 1 1>;
+				cooling-device = <&devfreq_vdd_cdev 2 2>;
 			};
 
 			adsp_vdd_cdev {