From c07d5a041952234079e29408b28768b292e03553 Mon Sep 17 00:00:00 2001 From: Manaf Meethalavalappu Pallikunhi Date: Thu, 24 Dec 2020 15:57:33 +0530 Subject: [PATCH 1/3] ARM: dts: qcom: Enable thermal zones and cooling devices for sa8195 Enable TSENS different thermal zones like userspace thermal zones, CPU isolation thermal zones, gpu max thermal zones, CDSP, NPU thermal zones and pmic alarm thermal zones etc. and different cooling devices for sa8195. Change-Id: I9cabba6e2d11875c869480e11501a24ff2eb7327 --- qcom/sa8195-pmic.dtsi | 166 ++++++ qcom/sa8195-thermal.dtsi | 1092 ++++++++++++++++++++++++++++++++++++++ qcom/sdmshrike-gpu.dtsi | 2 + qcom/sdmshrike.dtsi | 15 +- 4 files changed, 1269 insertions(+), 6 deletions(-) create mode 100644 qcom/sa8195-thermal.dtsi diff --git a/qcom/sa8195-pmic.dtsi b/qcom/sa8195-pmic.dtsi index 2ec01b703cc4..dc28f097358b 100644 --- a/qcom/sa8195-pmic.dtsi +++ b/qcom/sa8195-pmic.dtsi @@ -59,6 +59,13 @@ /delete-node/ refgen; }; +&lmh_dcvs1 { + isens_vref_0p8-supply = <&pm8195_3_l5>; + isens-vref-0p8-settings = <880000 880000 20000>; + isens_vref_1p8-supply = <&pm8195_1_l12>; + isens-vref-1p8-settings = <1800000 1800000 20000>; +}; + &camcc { vdd_mx-supply = <&VDD_MX_LEVEL>; vdd_mm-supply = <&VDD_MMCX_LEVEL>; @@ -97,6 +104,59 @@ type = "critical"; }; }; + + cooling-maps { + /* + * trip0 cooling map is dummy node to enable + * passive polling on trip0 violation. + */ + trip0_cpu0 { + trip = <&pm8195_1_trip0>; + cooling-device = <&CPU0 0 0>; + }; + + trip1_cpu0 { + trip = <&pm8195_1_trip1>; + cooling-device = + <&CPU0 THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + trip1_cpu1 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu1_isolate 1 1>; + }; + + trip1_cpu2 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu2_isolate 1 1>; + }; + + trip1_cpu3 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu3_isolate 1 1>; + }; + + trip1_cpu4 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu4_isolate 1 1>; + }; + + trip1_cpu5 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu5_isolate 1 1>; + }; + + trip1_cpu6 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + trip1_cpu7 { + trip = <&pm8195_1_trip1>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; }; pm8195_2_temp_alarm: pm8195_2_tz { @@ -124,6 +184,59 @@ type = "critical"; }; }; + + cooling-maps { + /* + * trip0 cooling map is dummy node to enable + * passive polling on trip0 violation. + */ + trip0_cpu0 { + trip = <&pm8195_2_trip0>; + cooling-device = <&CPU0 0 0>; + }; + + trip1_cpu0 { + trip = <&pm8195_2_trip1>; + cooling-device = + <&CPU0 THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + trip1_cpu1 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu1_isolate 1 1>; + }; + + trip1_cpu2 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu2_isolate 1 1>; + }; + + trip1_cpu3 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu3_isolate 1 1>; + }; + + trip1_cpu4 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu4_isolate 1 1>; + }; + + trip1_cpu5 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu5_isolate 1 1>; + }; + + trip1_cpu6 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + trip1_cpu7 { + trip = <&pm8195_2_trip1>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; }; pm8195_3_temp_alarm: pm8195_3_tz { @@ -151,5 +264,58 @@ type = "critical"; }; }; + + cooling-maps { + /* + * trip0 cooling map is dummy node to enable + * passive polling on trip0 violation. + */ + trip0_cpu0 { + trip = <&pm8195_3_trip0>; + cooling-device = <&CPU0 0 0>; + }; + + trip1_cpu0 { + trip = <&pm8195_3_trip1>; + cooling-device = + <&CPU0 THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + trip1_cpu1 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu1_isolate 1 1>; + }; + + trip1_cpu2 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu2_isolate 1 1>; + }; + + trip1_cpu3 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu3_isolate 1 1>; + }; + + trip1_cpu4 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu4_isolate 1 1>; + }; + + trip1_cpu5 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu5_isolate 1 1>; + }; + + trip1_cpu6 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + trip1_cpu7 { + trip = <&pm8195_3_trip1>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; }; }; diff --git a/qcom/sa8195-thermal.dtsi b/qcom/sa8195-thermal.dtsi new file mode 100644 index 000000000000..61b17cf0e965 --- /dev/null +++ b/qcom/sa8195-thermal.dtsi @@ -0,0 +1,1092 @@ +#include + +&cpufreq_hw { + #address-cells = <1>; + #size-cells = <1>; + lmh_dcvs0: qcom,limits-dcvs@18358800 { + compatible = "qcom,msm-hw-limits"; + interrupts = ; + qcom,affinity = <0>; + reg = <0x18358800 0x1000>, + <0x18323000 0x1000>; + }; + + lmh_dcvs1: qcom,limits-dcvs@18350800 { + compatible = "qcom,msm-hw-limits"; + interrupts = ; + qcom,affinity = <1>; + reg = <0x18350800 0x1000>, + <0x18325800 0x1000>; + isens_vref_0p8-supply = <&pm8150_2_l5_ao>; + isens-vref-0p8-settings = <880000 880000 20000>; + isens_vref_1p8-supply = <&pm8150_1_l12_ao>; + isens-vref-1p8-settings = <1800000 1800000 20000>; + }; + + qcom,cpu-isolation { + compatible = "qcom,cpu-isolate"; + cpu0_isolate: cpu0-isolate { + qcom,cpu = <&CPU0>; + #cooling-cells = <2>; + }; + + cpu1_isolate: cpu1-isolate { + qcom,cpu = <&CPU1>; + #cooling-cells = <2>; + }; + + cpu2_isolate: cpu2-isolate { + qcom,cpu = <&CPU2>; + #cooling-cells = <2>; + }; + + cpu3_isolate: cpu3-isolate { + qcom,cpu = <&CPU3>; + #cooling-cells = <2>; + }; + + cpu4_isolate: cpu4-isolate { + qcom,cpu = <&CPU4>; + #cooling-cells = <2>; + }; + + cpu5_isolate: cpu5-isolate { + qcom,cpu = <&CPU5>; + #cooling-cells = <2>; + }; + + cpu6_isolate: cpu6-isolate { + qcom,cpu = <&CPU6>; + #cooling-cells = <2>; + }; + + cpu7_isolate: cpu7-isolate { + qcom,cpu = <&CPU7>; + #cooling-cells = <2>; + }; + }; +}; + +&soc { + tsens0: tsens@c222000 { + compatible = "qcom,tsens24xx"; + reg = <0xc222000 0x4>, + <0xc263000 0x1ff>; + reg-names = "tsens_srot_physical", + "tsens_tm_physical"; + interrupts = , + ; + interrupt-names = "tsens-upper-lower", "tsens-critical"; + tsens-reinit-wa; + #thermal-sensor-cells = <1>; + }; + + tsens1: tsens@c223000 { + compatible = "qcom,tsens24xx"; + reg = <0xc223000 0x4>, + <0xc265000 0x1ff>; + reg-names = "tsens_srot_physical", + "tsens_tm_physical"; + interrupts = , + ; + interrupt-names = "tsens-upper-lower", "tsens-critical"; + tsens-reinit-wa; + #thermal-sensor-cells = <1>; + }; + + qmi-tmd-devices { + compatible = "qcom,qmi-cooling-devices"; + + adsp { + qcom,instance-id = <0x1>; + + adsp_vdd: adsp_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + }; + + cdsp { + qcom,instance-id = <0x43>; + + cdsp_vdd: cdsp_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + + cdsp_sw: cdsp { + qcom,qmi-dev-name = "cdsp_sw"; + #cooling-cells = <2>; + }; + + cdsp_hw: hvx { + qcom,qmi-dev-name = "cdsp_hw"; + #cooling-cells = <2>; + }; + }; + + slpi { + qcom,instance-id = <0x53>; + + slpi_vdd: slpi_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + }; + }; +}; + +&thermal_zones { + aoss0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 0>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-0-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 1>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-0-2-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 3>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-0-3-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 4>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 5>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 6>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 7>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 8>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-2-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 9>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-3-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 10>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-4-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 11>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-5-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 12>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-6-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 13>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-7-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 14>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpuss-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 15>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + aoss-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 0>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cwlan-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 1>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + video-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 2>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + ddr-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 3>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + q6-hvx-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 4>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + camera-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 5>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cmpss-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 6>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + mdm-core-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 7>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + npu-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 8>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + mdm-vec-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 9>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + mdm-scl-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens1 10>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpuss-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens1 11>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpuss-2-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens1 12>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpuss-3-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens1 13>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + ddrss-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens1 14>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + pcie-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens1 15>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + quad-gpuss-max-step { + polling-delay-passive = <10>; + polling-delay = <100>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 15>, <&tsens1 11>, + <&tsens1 12>, <&tsens1 13>; + sensor-aggregation = ; + trips { + gpu_trip0: gpu-trip0 { + temperature = <105000>; + hysteresis = <0>; + type = "passive"; + }; + }; + + cooling-maps { + gpu_cdev { + trip = <&gpu_trip0>; + cooling-device = <&msm_gpu THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + }; + }; + + cpu-0-0-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 1>; + trips { + cpu00_config: cpu00-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu00_cdev { + trip = <&cpu00_config>; + cooling-device = <&cpu0_isolate 1 1>; + }; + }; + }; + + cpu-0-1-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 2>; + trips { + cpu01_config: cpu01-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu01_cdev { + trip = <&cpu01_config>; + cooling-device = <&cpu1_isolate 1 1>; + }; + }; + }; + + cpu-0-2-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 3>; + trips { + cpu02_config: cpu02-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu02_cdev { + trip = <&cpu02_config>; + cooling-device = <&cpu2_isolate 1 1>; + }; + }; + }; + + cpu-0-3-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 4>; + thermal-governor = "step_wise"; + trips { + cpu03_config: cpu03-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu03_cdev { + trip = <&cpu03_config>; + cooling-device = <&cpu3_isolate 1 1>; + }; + }; + }; + + cpu-1-0-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 7>; + thermal-governor = "step_wise"; + trips { + cpu10_config: cpu10-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu10_cdev { + trip = <&cpu10_config>; + cooling-device = <&cpu4_isolate 1 1>; + }; + }; + }; + + cpu-1-1-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 8>; + thermal-governor = "step_wise"; + trips { + cpu11_config: cpu11-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu11_cdev { + trip = <&cpu11_config>; + cooling-device = <&cpu5_isolate 1 1>; + }; + }; + }; + + cpu-1-2-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 9>; + thermal-governor = "step_wise"; + trips { + cpu12_config: cpu12-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu12_cdev { + trip = <&cpu12_config>; + cooling-device = <&cpu6_isolate 1 1>; + }; + }; + }; + + cpu-1-3-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 10>; + thermal-governor = "step_wise"; + trips { + cpu13_config: cpu13-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu13_cdev { + trip = <&cpu13_config>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; + }; + + cpu-1-4-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 11>; + thermal-governor = "step_wise"; + trips { + cpu14_config: cpu14-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu14_cdev { + trip = <&cpu14_config>; + cooling-device = <&cpu4_isolate 1 1>; + }; + }; + }; + + cpu-1-5-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 12>; + thermal-governor = "step_wise"; + trips { + cpu15_config: cpu15-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu15_cdev { + trip = <&cpu15_config>; + cooling-device = <&cpu5_isolate 1 1>; + }; + }; + }; + + cpu-1-6-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 13>; + thermal-governor = "step_wise"; + trips { + cpu16_config: cpu16-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu16_cdev { + trip = <&cpu16_config>; + cooling-device = <&cpu6_isolate 1 1>; + }; + }; + }; + + cpu-1-7-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 14>; + thermal-governor = "step_wise"; + trips { + cpu17_config: cpu17-config { + temperature = <115000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu17_cdev { + trip = <&cpu17_config>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; + }; + + q6-hvx-step { + polling-delay-passive = <10>; + polling-delay = <0>; + thermal-sensors = <&tsens1 4>; + thermal-governor = "step_wise"; + trips { + q6_hvx_trip0: q6-hvx-trip0 { + temperature = <105000>; + hysteresis = <0>; + type = "passive"; + }; + + q6_hvx_trip1: q6-hvx-trip1 { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + cdsp-cdev0 { + trip = <&q6_hvx_trip0>; + cooling-device = <&cdsp_sw THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + + cdsp-cx-cdev0 { + trip = <&q6_hvx_trip1>; + cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + }; + }; + + npu-step { + polling-delay-passive = <10>; + polling-delay = <0>; + thermal-sensors = <&tsens1 8>; + thermal-governor = "step_wise"; + trips { + npu_trip0: npu-trip0 { + temperature = <105000>; + hysteresis = <0>; + type = "passive"; + }; + }; + + cooling-maps { + npu_cdev { + trip = <&npu_trip0>; + cooling-device = + <&msm_npu THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + }; + }; +}; diff --git a/qcom/sdmshrike-gpu.dtsi b/qcom/sdmshrike-gpu.dtsi index 363b7c191dd0..49c49699aad3 100644 --- a/qcom/sdmshrike-gpu.dtsi +++ b/qcom/sdmshrike-gpu.dtsi @@ -39,6 +39,8 @@ qcom,gpu-qdss-stm = <0x161c0000 0x40000>; /* base addr, size */ + #cooling-cells = <2>; + clocks = <&gcc GCC_GPU_CFG_AHB_CLK>, <&gpucc GPU_CC_CXO_CLK>, <&gcc GCC_DDRSS_GPU_AXI_CLK>, diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi index 6333ee3f9bdf..93aa6711af72 100644 --- a/qcom/sdmshrike.dtsi +++ b/qcom/sdmshrike.dtsi @@ -54,6 +54,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_0>; qcom,freq-domain = <&cpufreq_hw 0 4>; + qcom,lmh-dcvs = <&lmh_dcvs0>; #cooling-cells = <2>; L2_0: l2-cache { compatible = "arm,arch-cache"; @@ -79,7 +80,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_1>; qcom,freq-domain = <&cpufreq_hw 0 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_1: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x20000>; @@ -98,7 +99,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_2>; qcom,freq-domain = <&cpufreq_hw 0 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_2: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x20000>; @@ -117,7 +118,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_3>; qcom,freq-domain = <&cpufreq_hw 0 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_3: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x20000>; @@ -136,6 +137,7 @@ cache-size = <0x20000>; next-level-cache = <&L2_4>; qcom,freq-domain = <&cpufreq_hw 1 4>; + qcom,lmh-dcvs = <&lmh_dcvs1>; #cooling-cells = <2>; L2_4: l2-cache { compatible = "arm,arch-cache"; @@ -155,7 +157,7 @@ cache-size = <0x20000>; next-level-cache = <&L2_5>; qcom,freq-domain = <&cpufreq_hw 1 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs1>; L2_5: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x80000>; @@ -174,7 +176,7 @@ cache-size = <0x20000>; next-level-cache = <&L2_6>; qcom,freq-domain = <&cpufreq_hw 1 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs1>; L2_6: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x80000>; @@ -193,7 +195,7 @@ cache-size = <0x20000>; next-level-cache = <&L2_7>; qcom,freq-domain = <&cpufreq_hw 1 4>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs1>; L2_7: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x80000>; @@ -2317,6 +2319,7 @@ #include "sa8195-vidc.dtsi" #include "sa8155-audio.dtsi" #include "sm8150-npu.dtsi" +#include "sa8195-thermal.dtsi" #include "display/sdmshrike-sde-pll.dtsi" #include "display/sdmshrike-sde.dtsi" From cdc1575ac4c5fbfd7f775eb73c143820e04ec5ec Mon Sep 17 00:00:00 2001 From: Manaf Meethalavalappu Pallikunhi Date: Mon, 1 Feb 2021 12:24:16 +0530 Subject: [PATCH 2/3] ARM: dts: qcom: update pmic alarm thermal zone mitigation for sa8155/sa8195 The Pmic alarm sensor threshold is updated based on latest recommendation for sa8155/sa8195. Update pmic alarm thermal zone mitigation configuration accordingly for these targets. Change-Id: I4bd7165cc9b93665514396909f66104bf83259a1 --- qcom/sa8155-pmic-overlay.dtsi | 74 +++++++++-------------- qcom/sa8195-pmic.dtsi | 111 +++++++++++++--------------------- 2 files changed, 70 insertions(+), 115 deletions(-) diff --git a/qcom/sa8155-pmic-overlay.dtsi b/qcom/sa8155-pmic-overlay.dtsi index 8c84740ed630..10ecbbf260bb 100644 --- a/qcom/sa8155-pmic-overlay.dtsi +++ b/qcom/sa8155-pmic-overlay.dtsi @@ -163,54 +163,45 @@ pm8150_1_gpios: &pm8150_gpios { }; cooling-maps { - /* - * trip0 cooling map is dummy node to enable - * passive polling on trip0 violation. - */ trip0_cpu0 { trip = <&pm8150_2_trip0>; - cooling-device = <&CPU0 0 0>; - }; - - trip1_cpu0 { - trip = <&pm8150_2_trip1>; cooling-device = <&CPU0 THERMAL_MAX_LIMIT THERMAL_MAX_LIMIT>; }; - trip1_cpu1 { - trip = <&pm8150_2_trip1>; + trip0_cpu1 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu1_isolate 1 1>; }; - trip1_cpu2 { - trip = <&pm8150_2_trip1>; + trip0_cpu2 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu2_isolate 1 1>; }; - trip1_cpu3 { - trip = <&pm8150_2_trip1>; + trip0_cpu3 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu3_isolate 1 1>; }; - trip1_cpu4 { - trip = <&pm8150_2_trip1>; + trip0_cpu4 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu4_isolate 1 1>; }; - trip1_cpu5 { - trip = <&pm8150_2_trip1>; + trip0_cpu5 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu5_isolate 1 1>; }; - trip1_cpu6 { - trip = <&pm8150_2_trip1>; + trip0_cpu6 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu6_isolate 1 1>; }; - trip1_cpu7 { - trip = <&pm8150_2_trip1>; + trip0_cpu7 { + trip = <&pm8150_2_trip0>; cooling-device = <&cpu7_isolate 1 1>; }; }; @@ -218,54 +209,45 @@ pm8150_1_gpios: &pm8150_gpios { pm8150_tz { cooling-maps { - /* - * trip0 cooling map is dummy node to enable - * passive polling on trip0 violation. - */ trip0_cpu0 { trip = <&pm8150_trip0>; - cooling-device = <&CPU0 0 0>; - }; - - trip1_cpu0 { - trip = <&pm8150_trip1>; cooling-device = <&CPU0 THERMAL_MAX_LIMIT THERMAL_MAX_LIMIT>; }; - trip1_cpu1 { - trip = <&pm8150_trip1>; + trip0_cpu1 { + trip = <&pm8150_trip0>; cooling-device = <&cpu1_isolate 1 1>; }; - trip1_cpu2 { - trip = <&pm8150_trip1>; + trip0_cpu2 { + trip = <&pm8150_trip0>; cooling-device = <&cpu2_isolate 1 1>; }; - trip1_cpu3 { - trip = <&pm8150_trip1>; + trip0_cpu3 { + trip = <&pm8150_trip0>; cooling-device = <&cpu3_isolate 1 1>; }; - trip1_cpu4 { - trip = <&pm8150_trip1>; + trip0_cpu4 { + trip = <&pm8150_trip0>; cooling-device = <&cpu4_isolate 1 1>; }; - trip1_cpu5 { - trip = <&pm8150_trip1>; + trip0_cpu5 { + trip = <&pm8150_trip0>; cooling-device = <&cpu5_isolate 1 1>; }; - trip1_cpu6 { - trip = <&pm8150_trip1>; + trip0_cpu6 { + trip = <&pm8150_trip0>; cooling-device = <&cpu6_isolate 1 1>; }; - trip1_cpu7 { - trip = <&pm8150_trip1>; + trip0_cpu7 { + trip = <&pm8150_trip0>; cooling-device = <&cpu7_isolate 1 1>; }; }; diff --git a/qcom/sa8195-pmic.dtsi b/qcom/sa8195-pmic.dtsi index dc28f097358b..facbca2ecc34 100644 --- a/qcom/sa8195-pmic.dtsi +++ b/qcom/sa8195-pmic.dtsi @@ -106,54 +106,45 @@ }; cooling-maps { - /* - * trip0 cooling map is dummy node to enable - * passive polling on trip0 violation. - */ trip0_cpu0 { trip = <&pm8195_1_trip0>; - cooling-device = <&CPU0 0 0>; - }; - - trip1_cpu0 { - trip = <&pm8195_1_trip1>; cooling-device = <&CPU0 THERMAL_MAX_LIMIT THERMAL_MAX_LIMIT>; }; - trip1_cpu1 { - trip = <&pm8195_1_trip1>; + trip0_cpu1 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu1_isolate 1 1>; }; - trip1_cpu2 { - trip = <&pm8195_1_trip1>; + trip0_cpu2 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu2_isolate 1 1>; }; - trip1_cpu3 { - trip = <&pm8195_1_trip1>; + trip0_cpu3 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu3_isolate 1 1>; }; - trip1_cpu4 { - trip = <&pm8195_1_trip1>; + trip0_cpu4 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu4_isolate 1 1>; }; - trip1_cpu5 { - trip = <&pm8195_1_trip1>; + trip0_cpu5 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu5_isolate 1 1>; }; - trip1_cpu6 { - trip = <&pm8195_1_trip1>; + trip0_cpu6 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu6_isolate 1 1>; }; - trip1_cpu7 { - trip = <&pm8195_1_trip1>; + trip0_cpu7 { + trip = <&pm8195_1_trip0>; cooling-device = <&cpu7_isolate 1 1>; }; }; @@ -186,54 +177,45 @@ }; cooling-maps { - /* - * trip0 cooling map is dummy node to enable - * passive polling on trip0 violation. - */ trip0_cpu0 { trip = <&pm8195_2_trip0>; - cooling-device = <&CPU0 0 0>; - }; - - trip1_cpu0 { - trip = <&pm8195_2_trip1>; cooling-device = <&CPU0 THERMAL_MAX_LIMIT THERMAL_MAX_LIMIT>; }; - trip1_cpu1 { - trip = <&pm8195_2_trip1>; + trip0_cpu1 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu1_isolate 1 1>; }; - trip1_cpu2 { - trip = <&pm8195_2_trip1>; + trip0_cpu2 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu2_isolate 1 1>; }; - trip1_cpu3 { - trip = <&pm8195_2_trip1>; + trip0_cpu3 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu3_isolate 1 1>; }; - trip1_cpu4 { - trip = <&pm8195_2_trip1>; + trip0_cpu4 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu4_isolate 1 1>; }; - trip1_cpu5 { - trip = <&pm8195_2_trip1>; + trip0_cpu5 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu5_isolate 1 1>; }; - trip1_cpu6 { - trip = <&pm8195_2_trip1>; + trip0_cpu6 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu6_isolate 1 1>; }; - trip1_cpu7 { - trip = <&pm8195_2_trip1>; + trip0_cpu7 { + trip = <&pm8195_2_trip0>; cooling-device = <&cpu7_isolate 1 1>; }; }; @@ -266,54 +248,45 @@ }; cooling-maps { - /* - * trip0 cooling map is dummy node to enable - * passive polling on trip0 violation. - */ trip0_cpu0 { trip = <&pm8195_3_trip0>; - cooling-device = <&CPU0 0 0>; - }; - - trip1_cpu0 { - trip = <&pm8195_3_trip1>; cooling-device = <&CPU0 THERMAL_MAX_LIMIT THERMAL_MAX_LIMIT>; }; - trip1_cpu1 { - trip = <&pm8195_3_trip1>; + trip0_cpu1 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu1_isolate 1 1>; }; - trip1_cpu2 { - trip = <&pm8195_3_trip1>; + trip0_cpu2 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu2_isolate 1 1>; }; - trip1_cpu3 { - trip = <&pm8195_3_trip1>; + trip0_cpu3 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu3_isolate 1 1>; }; - trip1_cpu4 { - trip = <&pm8195_3_trip1>; + trip0_cpu4 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu4_isolate 1 1>; }; - trip1_cpu5 { - trip = <&pm8195_3_trip1>; + trip0_cpu5 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu5_isolate 1 1>; }; - trip1_cpu6 { - trip = <&pm8195_3_trip1>; + trip0_cpu6 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu6_isolate 1 1>; }; - trip1_cpu7 { - trip = <&pm8195_3_trip1>; + trip0_cpu7 { + trip = <&pm8195_3_trip0>; cooling-device = <&cpu7_isolate 1 1>; }; }; From ae206c2805531b00555572e5adcc7c7897fb7414 Mon Sep 17 00:00:00 2001 From: Manaf Meethalavalappu Pallikunhi Date: Mon, 1 Feb 2021 12:11:54 +0530 Subject: [PATCH 3/3] ARM: dts: qcom: Enable thermal zones and cooling devices for sa6155 Enable TSENS different thermal zones like userspace thermal zones, CPU isolation thermal zones, gpu max thermal zones, CDSP thermal zones and pmic alarm thermal zones etc. and different cooling devices for sa6155. Change-Id: I1c22a41bfaab72e64d1c170d65667a3617d59313 --- qcom/pm6155.dtsi | 2 - qcom/sa6155-pmic.dtsi | 47 ++ qcom/sa6155.dtsi | 127 +++++ qcom/sm6150-thermal.dtsi | 996 +++++++++++++++++++++++++++++++++++++++ qcom/sm6150.dtsi | 18 +- 5 files changed, 1182 insertions(+), 8 deletions(-) create mode 100644 qcom/sm6150-thermal.dtsi diff --git a/qcom/pm6155.dtsi b/qcom/pm6155.dtsi index 4666f0ad2626..cda605b20b87 100644 --- a/qcom/pm6155.dtsi +++ b/qcom/pm6155.dtsi @@ -22,7 +22,6 @@ reg = <0x2400>; interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_BOTH>; #thermal-sensor-cells = <0>; - qcom,temperature-threshold-set = <1>; }; qcom,power-on@800 { @@ -146,7 +145,6 @@ polling-delay = <0>; thermal-governor = "step_wise"; thermal-sensors = <&pm6155_1_tz>; - wake-capable-sensor; trips { pm6155_trip0: trip0 { diff --git a/qcom/sa6155-pmic.dtsi b/qcom/sa6155-pmic.dtsi index c777340b5c4b..f5c3cb70b5ff 100644 --- a/qcom/sa6155-pmic.dtsi +++ b/qcom/sa6155-pmic.dtsi @@ -61,3 +61,50 @@ vdda-0p9-supply = <&pm6155_1_l5>; }; +&thermal_zones { + pm6155-1-tz { + cooling-maps { + trip0_cpu0 { + trip = <&pm6155_trip0>; + cooling-device = + <&CPU0 THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + trip0_cpu1 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu1_isolate 1 1>; + }; + + trip0_cpu2 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu2_isolate 1 1>; + }; + + trip0_cpu3 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu3_isolate 1 1>; + }; + + trip0_cpu4 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu4_isolate 1 1>; + }; + + trip0_cpu5 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu5_isolate 1 1>; + }; + + trip0_cpu6 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu6_isolate 1 1>; + }; + + trip0_cpu7 { + trip = <&pm6155_trip0>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; + }; +}; diff --git a/qcom/sa6155.dtsi b/qcom/sa6155.dtsi index 25b695cba9ad..a564ea555b26 100644 --- a/qcom/sa6155.dtsi +++ b/qcom/sa6155.dtsi @@ -69,6 +69,133 @@ compatible = "qcom,sa6155-videocc", "syscon"; }; +&thermal_zones { + cpuss-0-step { + trips { + cpu45-config { + temperature = <115000>; + }; + }; + }; + + cpuss-1-step { + trips { + cpu23-config { + temperature = <115000>; + }; + }; + }; + + cpuss-2-step { + trips { + cpu01-config { + temperature = <115000>; + }; + }; + }; + + cpu-1-0-step { + trips { + cpu6-0-config { + temperature = <115000>; + }; + }; + }; + + cpu-1-1-step { + trips { + cpu6-1-config { + temperature = <115000>; + }; + }; + }; + + cpu-1-2-step { + trips { + cpu7-0-config { + temperature = <115000>; + }; + }; + }; + + cpu-1-3-step { + trips { + cpu7-1-config { + temperature = <115000>; + }; + }; + }; + + gpu-step { + trips { + gpu-trip { + temperature = <105000>; + }; + + gpu-cx-mon { + temperature = <110000>; + }; + }; + }; + + q6-hvx-step { + trips { + q6-hvx-config { + temperature = <105000>; + }; + + q6-hvx-trip1 { + temperature = <105000>; + }; + + q6-hvx-cx-mon { + temperature = <110000>; + }; + }; + }; + + mdm-core-step { + trips { + mdm-core-cx-mon { + temperature = <110000>; + }; + }; + }; + + camera-step { + trips { + camera-cx-mon { + temperature = <110000>; + }; + }; + }; + + wlan-step { + trips { + wlan-cx-mon { + temperature = <110000>; + }; + }; + }; + + display-step { + trips { + display-cx-mon { + temperature = <110000>; + }; + }; + }; + + video-step { + trips { + video-cx-mon { + temperature = <110000>; + }; + }; + }; +}; + + #include "sa6155-pcie.dtsi" &slpi_tlmm { status = "ok"; diff --git a/qcom/sm6150-thermal.dtsi b/qcom/sm6150-thermal.dtsi new file mode 100644 index 000000000000..06ac667f7e83 --- /dev/null +++ b/qcom/sm6150-thermal.dtsi @@ -0,0 +1,996 @@ +#include + +&cpufreq_hw { + #address-cells = <1>; + #size-cells = <1>; + lmh_dcvs0: qcom,limits-dcvs@18358800 { + compatible = "qcom,msm-hw-limits"; + interrupts = ; + qcom,affinity = <0>; + reg = <0x18358800 0x1000>, + <0x18323000 0x1000>; + }; + + lmh_dcvs1: qcom,limits-dcvs@18350800 { + compatible = "qcom,msm-hw-limits"; + interrupts = ; + qcom,affinity = <1>; + reg = <0x18350800 0x1000>, + <0x18325800 0x1000>; + }; + + qcom,cpu-isolation { + compatible = "qcom,cpu-isolate"; + cpu0_isolate: cpu0-isolate { + qcom,cpu = <&CPU0>; + #cooling-cells = <2>; + }; + + cpu1_isolate: cpu1-isolate { + qcom,cpu = <&CPU1>; + #cooling-cells = <2>; + }; + + cpu2_isolate: cpu2-isolate { + qcom,cpu = <&CPU2>; + #cooling-cells = <2>; + }; + + cpu3_isolate: cpu3-isolate { + qcom,cpu = <&CPU3>; + #cooling-cells = <2>; + }; + + cpu4_isolate: cpu4-isolate { + qcom,cpu = <&CPU4>; + #cooling-cells = <2>; + }; + + cpu5_isolate: cpu5-isolate { + qcom,cpu = <&CPU5>; + #cooling-cells = <2>; + }; + + cpu6_isolate: cpu6-isolate { + qcom,cpu = <&CPU6>; + #cooling-cells = <2>; + }; + + cpu7_isolate: cpu7-isolate { + qcom,cpu = <&CPU7>; + #cooling-cells = <2>; + }; + }; +}; + +&soc { + tsens0: tsens@c222000 { + compatible = "qcom,sm6150-tsens"; + reg = <0xc222000 0x8>, + <0xc263000 0x1ff>; + reg-names = "tsens_srot_physical", + "tsens_tm_physical"; + interrupts = , + ; + interrupt-names = "tsens-upper-lower", "tsens-critical"; + tsens-reinit-wa; + #thermal-sensor-cells = <1>; + }; + + qmi-tmd-devices { + compatible = "qcom,qmi-cooling-devices"; + + modem { + qcom,instance-id = <0x0>; + + modem_pa: modem_pa { + qcom,qmi-dev-name = "pa"; + #cooling-cells = <2>; + }; + + modem_proc: modem_proc { + qcom,qmi-dev-name = "modem"; + #cooling-cells = <2>; + }; + + modem_current: modem_current { + qcom,qmi-dev-name = "modem_current"; + #cooling-cells = <2>; + }; + + modem_skin: modem_skin { + qcom,qmi-dev-name = "modem_skin"; + #cooling-cells = <2>; + }; + + modem_vdd: modem_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + }; + + adsp { + qcom,instance-id = <0x1>; + + adsp_vdd: adsp_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + }; + + cdsp { + qcom,instance-id = <0x43>; + + cdsp_vdd: cdsp_vdd { + qcom,qmi-dev-name = "cpuv_restriction_cold"; + #cooling-cells = <2>; + }; + }; + }; +}; + +&thermal_zones { + aoss-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 0>; + + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 1>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 2>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-2-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "user_space"; + thermal-sensors = <&tsens0 3>; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpuss-3-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 4>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-0-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 5>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-1-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 6>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-2-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 7>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + cpu-1-3-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 8>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpu-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 9>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + q6-hvx-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 10>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + mdm-core-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 11>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + camera-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 12>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + wlan-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 13>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + display-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 14>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + video-usr { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 15>; + thermal-governor = "user_space"; + trips { + active-config0 { + temperature = <125000>; + hysteresis = <1000>; + type = "passive"; + }; + + reset-mon-1-cfg { + temperature = <110000>; + hysteresis = <5000>; + type = "passive"; + }; + + reset-mon-2-cfg { + temperature = <115000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + }; + + gpu-step { + polling-delay-passive = <10>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 9>; + trips { + gpu_trip: gpu-trip { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + gpu_cx_mon: gpu-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + gpu_cdev { + trip = <&gpu_trip>; + cooling-device = <&msm_gpu THERMAL_NO_LIMIT + THERMAL_NO_LIMIT>; + }; + + gpu-cx-cdev0 { + trip = <&gpu_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + gpu-cx-cdev1 { + trip = <&gpu_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + gpu-cx-cdev2 { + trip = <&gpu_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + gpu-cx-cdev3 { + trip = <&gpu_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + cpuss-0-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 1>; + trips { + cpu45_config: cpu45-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu4_cdev { + trip = <&cpu45_config>; + cooling-device = <&cpu4_isolate 1 1>; + }; + + cpu5_cdev { + trip = <&cpu45_config>; + cooling-device = <&cpu5_isolate 1 1>; + }; + }; + }; + + cpuss-1-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-governor = "step_wise"; + thermal-sensors = <&tsens0 2>; + trips { + cpu23_config: cpu23-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu2_cdev { + trip = <&cpu23_config>; + cooling-device = <&cpu2_isolate 1 1>; + }; + + cpu3_cdev { + trip = <&cpu23_config>; + cooling-device = <&cpu3_isolate 1 1>; + }; + }; + }; + + cpuss-2-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 3>; + thermal-governor = "step_wise"; + trips { + cpu01_config: cpu01-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu0_cdev { + trip = <&cpu01_config>; + cooling-device = <&cpu0_isolate 1 1>; + }; + + cpu1_cdev { + trip = <&cpu01_config>; + cooling-device = <&cpu1_isolate 1 1>; + }; + }; + }; + + cpu-1-0-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 5>; + thermal-governor = "step_wise"; + trips { + cpu6_0_config: cpu6-0-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu6_cdev { + trip = <&cpu6_0_config>; + cooling-device = <&cpu6_isolate 1 1>; + }; + }; + }; + + cpu-1-1-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 6>; + thermal-governor = "step_wise"; + trips { + cpu6_1_config: cpu6-1-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu6_cdev { + trip = <&cpu6_1_config>; + cooling-device = <&cpu6_isolate 1 1>; + }; + }; + }; + + cpu-1-2-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 7>; + thermal-governor = "step_wise"; + trips { + cpu7_0_config: cpu7-0-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu7_cdev { + trip = <&cpu7_0_config>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; + }; + + cpu-1-3-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 8>; + thermal-governor = "step_wise"; + trips { + cpu7_1_config: cpu7-1-config { + temperature = <110000>; + hysteresis = <10000>; + type = "passive"; + }; + }; + + cooling-maps { + cpu7_cdev { + trip = <&cpu7_1_config>; + cooling-device = <&cpu7_isolate 1 1>; + }; + }; + }; + + q6-hvx-step { + polling-delay-passive = <10>; + polling-delay = <0>; + thermal-sensors = <&tsens0 10>; + thermal-governor = "step_wise"; + + trips { + q6_hvx_therm: q6-hvx-trip1 { + temperature = <95000>; + hysteresis = <0>; + type = "passive"; + }; + + q6_hvx_cx_mon: q6-hvx-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + cdsp-cdev { + trip = <&q6_hvx_therm>; + cooling-device = <&msm_cdsp_rm + THERMAL_NO_LIMIT 5>; + }; + + hvx-cx-cdev0 { + trip = <&q6_hvx_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + hvx-cx-cdev1 { + trip = <&q6_hvx_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + hvx-cx-cdev2 { + trip = <&q6_hvx_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + hvx-cx-cdev3 { + trip = <&q6_hvx_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + mdm-core-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 11>; + thermal-governor = "step_wise"; + trips { + mdm_core_cx_mon: mdm-core-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + mdm-cx-cdev0 { + trip = <&mdm_core_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + mdm-cx-cdev1 { + trip = <&mdm_core_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + mdm-cx-cdev2 { + trip = <&mdm_core_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + mdm-cx-cdev3 { + trip = <&mdm_core_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + camera-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 12>; + thermal-governor = "step_wise"; + trips { + camera_cx_mon: camera-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + camera-cx-cdev0 { + trip = <&camera_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + camera-cx-cdev1 { + trip = <&camera_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + camera-cx-cdev2 { + trip = <&camera_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + camera-cx-cdev3 { + trip = <&camera_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + wlan-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 13>; + thermal-governor = "step_wise"; + trips { + wlan_cx_mon: wlan-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + wlan-cx-cdev0 { + trip = <&wlan_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + wlan-cx-cdev1 { + trip = <&wlan_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + wlan-cx-cdev2 { + trip = <&wlan_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + wlan-cx-cdev3 { + trip = <&wlan_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + display-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 14>; + thermal-governor = "step_wise"; + trips { + dispaly_cx_mon: display-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + display-cx-cdev0 { + trip = <&dispaly_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + display-cx-cdev1 { + trip = <&dispaly_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + display-cx-cdev2 { + trip = <&dispaly_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + display-cx-cdev3 { + trip = <&dispaly_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; + + video-step { + polling-delay-passive = <0>; + polling-delay = <0>; + thermal-sensors = <&tsens0 15>; + thermal-governor = "step_wise"; + + trips { + video_cx_mon: video-cx-mon { + temperature = <100000>; + hysteresis = <5000>; + type = "passive"; + }; + }; + + cooling-maps { + video-cx-cdev0 { + trip = <&video_cx_mon>; + cooling-device = <&msm_gpu THERMAL_MAX_LIMIT + THERMAL_MAX_LIMIT>; + }; + + video-cx-cdev1 { + trip = <&video_cx_mon>; + cooling-device = <&modem_proc 3 3>; + }; + + video-cx-cdev2 { + trip = <&video_cx_mon>; + cooling-device = <&modem_pa 3 3>; + }; + + video-cx-cdev3 { + trip = <&video_cx_mon>; + cooling-device = <&msm_cdsp_rm 5 5>; + }; + }; + }; +}; diff --git a/qcom/sm6150.dtsi b/qcom/sm6150.dtsi index b273ebb1a19f..7c963503b96e 100644 --- a/qcom/sm6150.dtsi +++ b/qcom/sm6150.dtsi @@ -54,6 +54,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_0>; qcom,freq-domain = <&cpufreq_hw 0 6>; + qcom,lmh-dcvs = <&lmh_dcvs0>; #cooling-cells = <2>; L2_0: l2-cache { compatible = "arm,arch-cache"; @@ -80,7 +81,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_100>; qcom,freq-domain = <&cpufreq_hw 0 6>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_100: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x10000>; @@ -101,7 +102,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_200>; qcom,freq-domain = <&cpufreq_hw 0 6>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_200: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x10000>; @@ -121,7 +122,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_300>; qcom,freq-domain = <&cpufreq_hw 0 6>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_300: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x10000>; @@ -141,7 +142,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_400>; qcom,freq-domain = <&cpufreq_hw 0 6>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_400: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x10000>; @@ -161,7 +162,7 @@ cache-size = <0x8000>; next-level-cache = <&L2_500>; qcom,freq-domain = <&cpufreq_hw 0 6>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs0>; L2_500: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x10000>; @@ -181,6 +182,7 @@ cache-size = <0x10000>; next-level-cache = <&L2_600>; qcom,freq-domain = <&cpufreq_hw 1 2>; + qcom,lmh-dcvs = <&lmh_dcvs1>; #cooling-cells = <2>; L2_600: l2-cache { compatible = "arm,arch-cache"; @@ -201,7 +203,7 @@ cache-size = <0x10000>; next-level-cache = <&L2_700>; qcom,freq-domain = <&cpufreq_hw 1 2>; - #cooling-cells = <2>; + qcom,lmh-dcvs = <&lmh_dcvs1>; L2_700: l2-cache { compatible = "arm,arch-cache"; cache-size = <0x40000>; @@ -1518,6 +1520,9 @@ status = "disabled"; }; + thermal_zones: thermal-zones { + }; + ufshc_mem: ufshc@1d84000 { compatible = "qcom,ufshc"; reg = <0x1d84000 0x3000>, @@ -2543,3 +2548,4 @@ #include "sm6150-usb.dtsi" #include "sm6150-vidc.dtsi" #include "sm6150-ion.dtsi" +#include "sm6150-thermal.dtsi"