Merge "ARM: dts: qcom: Update skin and cx thermal config for HOLI"

This commit is contained in:
qctecmdr 2020-11-19 14:10:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit e829082d1d
2 changed files with 199 additions and 37 deletions

View file

@ -326,64 +326,231 @@
&thermal_zones {
quiet-therm-step {
polling-delay-passive = <0>;
polling-delay-passive = <2000>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm6150l_adc_tm ADC5_GPIO4_100K_PU>;
trips {
quiet_modem_trip0: quiet-modem-trip0 {
battery_trip0: battery-trip0 {
temperature = <42000>;
hysteresis = <2000>;
type = "passive";
};
modem_skin_trip0: modem-skin-trip0 {
temperature = <42000>;
hysteresis = <4000>;
type = "passive";
};
quiet_modem_trip1: quiet-modem-trip1 {
gold_trip: gold-trip {
temperature = <43000>;
hysteresis = <0>;
type = "passive";
};
battery_trip1: battery-trip1 {
temperature = <44000>;
hysteresis = <2000>;
type = "passive";
};
modem_skin_trip1: modem-skin-trip1 {
temperature = <44000>;
hysteresis = <4000>;
type = "passive";
};
quiet_cx_trip: quiet-cx-trip {
temperature = <55000>;
hysteresis = <5000>;
silver_trip: silver-trip {
temperature = <45000>;
hysteresis = <0>;
type = "passive";
};
quiet_modem_trip2: quiet-modem-trip2 {
temperature = <56000>;
battery_trip2: battery-trip2 {
temperature = <46000>;
hysteresis = <2000>;
type = "passive";
};
battery_trip3: battery-trip3 {
temperature = <47000>;
hysteresis = <1000>;
type = "passive";
};
battery_trip4: battery-trip4 {
temperature = <48000>;
hysteresis = <1000>;
type = "passive";
};
cx_trip: cx-trip {
temperature = <55000>;
hysteresis = <5000>;
type = "passive";
};
};
cooling-maps {
gpu-cdev {
trip = <&quiet_cx_trip>;
cdsp-cdev {
trip = <&cx_trip>;
cooling-device = <&cdsp_sw 4 4>;
};
gpu-cdev0 {
trip = <&modem_skin_trip1>;
/* throttle to 650000000Hz */
cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-4)
(THERMAL_MAX_LIMIT-4)>;
};
gpu-cdev1 {
trip = <&cx_trip>;
/* throttle to 565000000Hz */
cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-3)
(THERMAL_MAX_LIMIT-3)>;
};
cdsp-cdev0 {
trip = <&quiet_cx_trip>;
cooling-device = <&cdsp_sw 4 4>;
silver-cdev {
trip = <&silver_trip>;
/* throttle to 1478400KHz */
cooling-device = <&CPU0 (THERMAL_MAX_LIMIT-6)
(THERMAL_MAX_LIMIT-6)>;
};
gold-cdev {
trip = <&gold_trip>;
/* throttle to 1536000KHz */
cooling-device = <&CPU6 (THERMAL_MAX_LIMIT-5)
(THERMAL_MAX_LIMIT-5)>;
};
modem-skin-cdev0 {
trip = <&quiet_modem_trip0>;
trip = <&modem_skin_trip0>;
cooling-device = <&modem_skin 1 1>;
};
modem-skin-cdev1 {
trip = <&quiet_modem_trip1>;
trip = <&modem_skin_trip1>;
cooling-device = <&modem_skin 2 2>;
};
modem-skin-cdev2 {
trip = <&quiet_modem_trip2>;
trip = <&cx_trip>;
cooling-device = <&modem_skin 3 3>;
};
battery-cdev0 {
trip = <&battery_trip0>;
cooling-device = <&pm7250b_charger 6 6>;
};
battery-cdev1 {
trip = <&battery_trip1>;
cooling-device = <&pm7250b_charger 10 10>;
};
battery-cdev2 {
trip = <&battery_trip2>;
cooling-device = <&pm7250b_charger 14 14>;
};
battery-cdev3 {
trip = <&battery_trip3>;
cooling-device = <&pm7250b_charger 16 16>;
};
battery-cdev4 {
trip = <&battery_trip4>;
cooling-device = <&pm7250b_charger 18 18>;
};
};
};
pa-therm0-step {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm6150l_adc_tm ADC5_AMUX_THM3_100K_PU>;
trips {
modem_trip0: modem-trip0 {
temperature = <46000>;
hysteresis = <4000>;
type = "passive";
};
modem_trip1: modem-trip1 {
temperature = <47000>;
hysteresis = <4000>;
type = "passive";
};
modem_trip2: modem-trip2 {
temperature = <56000>;
hysteresis = <4000>;
type = "passive";
};
};
cooling-maps {
modem-cdev0 {
trip = <&modem_trip0>;
cooling-device = <&modem_pa 1 1>;
};
modem-cdev1 {
trip = <&modem_trip1>;
cooling-device = <&modem_pa 2 2>;
};
modem-cdev2 {
trip = <&modem_trip2>;
cooling-device = <&modem_pa 3 3>;
};
};
};
xo-therm-step {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;
trips {
modem_pa_fr1_trip0: modem-pa-fr1-trip0 {
temperature = <45000>;
hysteresis = <4000>;
type = "passive";
};
modem_pa_fr1_trip1: modem-pa-fr1-trip1 {
temperature = <46000>;
hysteresis = <4000>;
type = "passive";
};
modem_pa_fr1_trip2: modem-pa-fr1-trip2 {
temperature = <56000>;
hysteresis = <4000>;
type = "passive";
};
};
cooling-maps {
modem_pa_fr1_cdev0 {
trip = <&modem_pa_fr1_trip0>;
cooling-device = <&modem_pa_fr1 1 1>;
};
modem_pa_fr1_cdev1 {
trip = <&modem_pa_fr1_trip1>;
cooling-device = <&modem_pa_fr1 2 2>;
};
modem_pa_fr1_cdev2 {
trip = <&modem_pa_fr1_trip2>;
cooling-device = <&modem_pa_fr1 3 3>;
};
};
};
};

View file

@ -905,13 +905,13 @@
thermal-governor = "step_wise";
trips {
cdsp_trip0: cdsp-trip0 {
q6_hvx_trip0: q6-hvx-trip0 {
temperature = <95000>;
hysteresis = <0>;
type = "passive";
};
cdsp_cx_mon: cdsp-cx-mon {
q6_hvx_cx_mon: q6-hvx-cx-mon {
temperature = <100000>;
hysteresis = <5000>;
type = "passive";
@ -919,32 +919,27 @@
};
cooling-maps {
cdsp-cdev0 {
trip = <&cdsp_trip0>;
q6-hvx-cdev0 {
trip = <&q6_hvx_trip0>;
cooling-device = <&cdsp_sw THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
cdsp-cx-cdev0 {
trip = <&cdsp_cx_mon>;
cooling-device = <&msm_gpu THERMAL_MAX_LIMIT
THERMAL_MAX_LIMIT>;
q6-hvx-cx-cdev0 {
trip = <&q6_hvx_cx_mon>;
/* throttle to 565000000Hz */
cooling-device = <&msm_gpu (THERMAL_MAX_LIMIT-3)
(THERMAL_MAX_LIMIT-3)>;
};
cdsp-cx-cdev1 {
trip = <&cdsp_cx_mon>;
cooling-device = <&modem_tj 3 3>;
q6-hvx-cx-cdev1 {
trip = <&q6_hvx_cx_mon>;
cooling-device = <&modem_skin 3 3>;
};
cdsp-cx-cdev2 {
trip = <&cdsp_cx_mon>;
cooling-device = <&modem_pa 3 3>;
};
cdsp-cx-cdev3 {
trip = <&cdsp_cx_mon>;
cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
THERMAL_MAX_LIMIT>;
q6-hvx-cx-cdev2 {
trip = <&q6_hvx_cx_mon>;
cooling-device = <&cdsp_sw 4 4>;
};
};
};