Merge "ARM: dts: msm: add devfreq-vdd-cdev cooling device and remove gfx-cdev"

This commit is contained in:
qctecmdr 2021-11-24 13:00:40 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9aaf60b56a
3 changed files with 10 additions and 26 deletions

View file

@ -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 */

View file

@ -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 */

View file

@ -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 {