Merge "ARM: dts: qcom: Enable userspace cpu and gpu cooling devices for khaje"

This commit is contained in:
qctecmdr
2022-09-12 12:11:03 -07:00
committed by Gerrit - the friendly Code Review server
5 changed files with 56 additions and 110 deletions

View File

@@ -1,6 +1,6 @@
#include <dt-bindings/thermal/thermal_qti.h>
&cpufreq_hw {
&soc {
#address-cells = <1>;
#size-cells = <1>;
lmh_dcvs0: qcom,limits-dcvs@f521000 {
@@ -9,8 +9,6 @@
qcom,affinity = <0>;
reg = <0xf550800 0x1000>,
<0xf521000 0x1000>;
qcom,no-cooling-device-register;
#thermal-sensor-cells = <0>;
};
lmh_dcvs1: qcom,limits-dcvs@f523000 {
@@ -19,8 +17,6 @@
qcom,affinity = <1>;
reg = <0xf550800 0x1000>,
<0xf523000 0x1000>;
qcom,no-cooling-device-register;
#thermal-sensor-cells = <0>;
};
qcom,cpu-pause {
@@ -107,9 +103,7 @@
qcom,cdev-alias = "pause-cpu7";
};
};
};
&soc {
tsens0:tsens@c222000 {
compatible = "qcom,tsens24xx";
reg = <0x04410000 0x8>,
@@ -198,6 +192,16 @@
qcom,bypass-client-list = <0x1004 0x4004 0x6004 0xc004 0xc008>;
#cooling-cells = <2>;
};
qcom,devfreq-cdev {
compatible = "qcom,devfreq-cdev";
qcom,devfreq = <&msm_gpu>;
};
qcom,cpufreq-cdev {
compatible = "qcom,cpufreq-cdev";
qcom,cpus = <&CPU0 &CPU4>;
};
};
&thermal_zones {
@@ -221,7 +225,7 @@
};
cdsp-hvx {
polling-delay-passive = <0>;
polling-delay-passive = <10>;
polling-delay = <0>;
thermal-sensors = <&tsens0 1>;
trips {
@@ -270,6 +274,7 @@
cdsp-cx-cdev0 {
trip = <&cdsp_cx_mon>;
cooling-device = <&msm_gpu 4 THERMAL_NO_LIMIT>;
};
cdsp-cx-cdev1 {
@@ -373,6 +378,7 @@
cooling-maps {
mdm1-cx-cdev0 {
trip = <&mdm1_cx_mon>;
cooling-device = <&msm_gpu 4 THERMAL_NO_LIMIT>;
};
mdm1-cx-cdev1 {
@@ -710,6 +716,7 @@
cooling-maps {
mdm0-cx-cdev0 {
trip = <&mdm0_cx_mon>;
cooling-device = <&msm_gpu 4 THERMAL_NO_LIMIT>;
};
mdm0-cx-cdev1 {
@@ -749,7 +756,7 @@
};
gpu {
polling-delay-passive = <0>;
polling-delay-passive = <10>;
polling-delay = <0>;
thermal-sensors = <&tsens0 15>;
trips {
@@ -787,10 +794,13 @@
cooling-maps {
gpu_cdev {
trip = <&gpu_step_trip>;
cooling-device = <&msm_gpu THERMAL_NO_LIMIT
THERMAL_NO_LIMIT>;
};
gpu-cx-cdev0 {
trip = <&gpu_cx_mon>;
cooling-device = <&msm_gpu 4 THERMAL_NO_LIMIT>;
};
gpu-cx-cdev1 {
@@ -940,6 +950,7 @@
gpu_cdev {
trip = <&skin_gpu_trip>;
cooling-device = <&msm_gpu 0 3>;
};
hvx_cdev {
@@ -971,22 +982,6 @@
trip = <&skin_modem_trip3>;
cooling-device = <&modem_proc 3 3>;
};
batt_cdev1 {
trip = <&skin_batt_trip0>;
};
batt_cdev2 {
trip = <&skin_batt_trip1>;
};
batt_cdev3 {
trip = <&skin_batt_trip2>;
};
batt_cdev4 {
trip = <&skin_batt_trip3>;
};
};
};

View File

@@ -204,7 +204,7 @@
};
&thermal_zones {
quiet-thermal-step {
quiet-therm {
cooling-maps {
quiet_batt_cdev1 {
trip = <&quiet_batt_trip0>;
@@ -225,10 +225,17 @@
trip = <&quiet_batt_trip3>;
cooling-device = <&pm7250b_charger 16 16>;
};
};
};
quiet_batt_cdev5 {
trip = <&quiet_batt_trip4>;
cooling-device = <&pm7250b_charger 18 18>;
pm7250b-tz {
cooling-maps {
trip0_bat {
cooling-device = <&pm7250b_charger 15 15>;
};
trip1_bat {
cooling-device = <&pm7250b_charger 16 16>;
};
};
};

View File

@@ -209,12 +209,10 @@
};
&thermal_zones {
quiet-thermal-step {
quiet-therm {
polling-delay-passive = <2000>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM2_100K_PU>;
wake-capable-sensor;
trips {
quiet_batt_trip0: batt-trip0 {
@@ -288,19 +286,18 @@
gold_cdev {
trip = <&quiet_gold_trip>;
/* limit to 1766400khz */
cooling-device = <&CPU4 THERMAL_NO_LIMIT
(THERMAL_MAX_LIMIT-4)>;
cooling-device = <&CPU4 0 4>;
};
silver_cdev {
trip = <&quiet_silver_trip>;
/* limit to 1516800khz */
cooling-device = <&CPU0 THERMAL_NO_LIMIT
(THERMAL_MAX_LIMIT-4)>;
cooling-device = <&CPU0 0 2>;
};
gpu_cdev {
trip = <&quiet_gpu_trip>;
cooling-device = <&msm_gpu 0 3>;
};
hvx_cdev {
@@ -320,12 +317,10 @@
};
};
pa-therm0-step {
pa-therm0 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm6125_adc_tm ADC5_AMUX_THM1_100K_PU>;
wake-capable-sensor;
trips {
pa_therm0_trip0: pa-therm0-trip0 {

View File

@@ -6,18 +6,18 @@
trip0_bat {
trip = <&pm7250b_trip0>;
cooling-device =
<&pm7250b_charger 15 15>;
<&pm7250b_charger 9 9>;
};
trip1_bat {
trip = <&pm7250b_trip1>;
cooling-device =
<&pm7250b_charger 16 16>;
<&pm7250b_charger 10 10>;
};
};
};
soc {
socd {
cooling-maps {
soc_cpu4 {
trip = <&soc_trip>;
@@ -60,6 +60,7 @@
lbat0_gpu {
trip = <&b_bcl_lvl0>;
cooling-device = <&msm_gpu 2 2>;
};
lbat0_cdsp {
@@ -83,6 +84,7 @@
lbat1_gpu {
trip = <&b_bcl_lvl1>;
cooling-device = <&msm_gpu 4 4>;
};
lbat1_cdsp {
@@ -96,6 +98,7 @@
cooling-maps {
lbat2_gpu {
trip = <&b_bcl_lvl2>;
cooling-device = <&msm_gpu 4 THERMAL_NO_LIMIT>;
};
lbat2_cdsp {

View File

@@ -428,9 +428,7 @@
pm7250b_temp_alarm: pm7250b-tz {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_tz>;
wake-capable-sensor;
trips {
pm7250b_trip0: trip0 {
@@ -456,9 +454,7 @@
pm7250b-ibat-lvl0 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_bcl 0>;
wake-capable-sensor;
trips {
ibat_lvl0:ibat-lvl0 {
@@ -472,9 +468,7 @@
pm7250b-ibat-lvl1 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_bcl 1>;
wake-capable-sensor;
trips {
ibat_lvl1:ibat-lvl1 {
@@ -485,63 +479,10 @@
};
};
pm7250b-vbat-lvl0 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "low_limits_cap";
thermal-sensors = <&pm7250b_bcl 2>;
wake-capable-sensor;
tracks-low;
trips {
vbat_lvl0: vbat-lvl0 {
temperature = <3000>;
hysteresis = <200>;
type = "passive";
};
};
};
pm7250b-vbat-lvl1 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "low_limits_cap";
thermal-sensors = <&pm7250b_bcl 3>;
wake-capable-sensor;
tracks-low;
trips {
vbat_lvl1:vbat-lvl1 {
temperature = <2800>;
hysteresis = <200>;
type = "passive";
};
};
};
pm7250b-vbat-lvl2 {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-governor = "low_limits_cap";
thermal-sensors = <&pm7250b_bcl 4>;
wake-capable-sensor;
tracks-low;
trips {
vbat_lvl2:vbat-lvl2 {
temperature = <2600>;
hysteresis = <200>;
type = "passive";
};
};
};
pm7250b-bcl-lvl0 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_bcl 5>;
wake-capable-sensor;
trips {
b_bcl_lvl0: b-bcl-lvl0 {
@@ -555,9 +496,7 @@
pm7250b-bcl-lvl1 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_bcl 6>;
wake-capable-sensor;
trips {
b_bcl_lvl1: b-bcl-lvl1 {
@@ -571,9 +510,7 @@
pm7250b-bcl-lvl2 {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "step_wise";
thermal-sensors = <&pm7250b_bcl 7>;
wake-capable-sensor;
trips {
b_bcl_lvl2: b-bcl-lvl2 {
@@ -584,17 +521,26 @@
};
};
soc {
socd {
polling-delay-passive = <100>;
polling-delay = <0>;
thermal-governor = "low_limits_cap";
thermal-sensors = <&bcl_soc>;
wake-capable-sensor;
tracks-low;
trips {
thermal-engine-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
thermal-hal-trip {
temperature = <100>;
hysteresis = <0>;
type = "passive";
};
soc_trip:soc-trip {
temperature = <10>;
temperature = <90>;
hysteresis = <0>;
type = "passive";
};