Commit 71257fd0 authored by Linaro CI's avatar Linaro CI

Merge remote-tracking branch 'tsens-thermal/integration/thermal-automerge'...

Merge remote-tracking branch 'tsens-thermal/integration/thermal-automerge' into integration-linux-qcomlt

# Conflicts:
#	arch/arm64/boot/dts/qcom/msm8996.dtsi
parents f5c21c22 1245d215
......@@ -6,11 +6,14 @@ Required properties:
- "qcom,msm8916-tsens" (MSM8916)
- "qcom,msm8974-tsens" (MSM8974)
- "qcom,msm8996-tsens" (MSM8996)
- "qcom,qcs404-tsens", "qcom,tsens-v1" (QCS404)
- "qcom,msm8998-tsens", "qcom,tsens-v2" (MSM8998)
- "qcom,sdm845-tsens", "qcom,tsens-v2" (SDM845)
The generic "qcom,tsens-v2" property must be used as a fallback for any SoC
with version 2 of the TSENS IP. MSM8996 is the only exception because the
generic property did not exist when support was added.
Similarly, the generic "qcom,tsens-v1" property must be used as a fallback for
any SoC with version 1 of the TSENS IP.
- reg: Address range of the thermal registers.
New platforms containing v2.x.y of the TSENS IP must specify the SROT and TM
......@@ -39,3 +42,14 @@ tsens0: [email protected] {
#qcom,sensors = <13>;
#thermal-sensor-cells = <1>;
};
Example 3 (for any platform containing v1 of the TSENS IP):
tsens: [email protected] {
compatible = "qcom,qcs404-tsens", "qcom,tsens-v1";
reg = <0x004a9000 0x1000>, /* TM */
<0x004a8000 0x1000>; /* SROT */
nvmem-cells = <&tsens_caldata>;
nvmem-cell-names = "calib";
#qcom,sensors = <10>;
#thermal-sensor-cells = <1>;
};
......@@ -181,19 +181,19 @@
};
thermal-zones {
cpu-thermal0 {
cpu0_1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens 4>;
trips {
cpu_alert0: trip0 {
cpu0_1_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit0: trip1 {
cpu0_1_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -202,7 +202,7 @@
cooling-maps {
map0 {
trip = <&cpu_alert0>;
trip = <&cpu0_1_alert0>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
......@@ -211,19 +211,19 @@
};
};
cpu-thermal1 {
cpu2_3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens 3>;
trips {
cpu_alert1: trip0 {
cpu2_3_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit1: trip1 {
cpu2_3_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -232,7 +232,7 @@
cooling-maps {
map0 {
trip = <&cpu_alert1>;
trip = <&cpu2_3_alert0>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
......@@ -248,12 +248,12 @@
thermal-sensors = <&tsens 2>;
trips {
gpu_alert: trip0 {
gpu_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
gpu_crit: trip1 {
gpu_crit: gpu_crit {
temperature = <95000>;
hysteresis = <2000>;
type = "critical";
......@@ -268,18 +268,27 @@
thermal-sensors = <&tsens 1>;
trips {
cam_alert: trip0 {
cam_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
type = "hot";
};
cam_crit: trip1 {
temperature = <95000>;
};
};
modem-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens 0>;
trips {
modem_alert0: [email protected] {
temperature = <75000>;
hysteresis = <2000>;
type = "critical";
type = "hot";
};
};
};
};
......
......@@ -598,19 +598,19 @@
};
thermal-zones {
cpu-thermal0 {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 3>;
trips {
cpu_alert0: cpu_alert0 {
cpu0_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "active";
};
cpu_crit0: cpu_crit0 {
cpu0_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -619,29 +619,25 @@
cooling-maps {
map0 {
trip = <&cpu_alert0>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT 7>;
};
map1 {
trip = <&cpu_warn0>;
cooling-device = <&CPU0 8 THERMAL_NO_LIMIT>;
trip = <&cpu0_alert0>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
cpu-thermal1 {
cpu1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 5>;
trips {
cpu_alert1: cpu_alert1 {
cpu1_alert0: [email protected] {
temperature = <75000>;
hysteresis = <2000>;
type = "active";
};
cpu_crit1: cpu_crit1 {
cpu1_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -650,29 +646,25 @@
cooling-maps {
map0 {
trip = <&cpu_alert1>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT 7>;
};
map1 {
trip = <&cpu_warn1>;
cooling-device = <&CPU0 8 THERMAL_NO_LIMIT>;
trip = <&cpu1_alert0>;
cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
cpu-thermal2 {
cpu2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 8>;
trips {
cpu_alert2: cpu_alert2 {
cpu2_alert0: trip[email protected] {
temperature = <75000>;
hysteresis = <2000>;
type = "active";
};
cpu_crit2: cpu_crit2 {
cpu2_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -680,29 +672,25 @@
};
cooling-maps {
map0 {
trip = <&cpu_alert2>;
cooling-device = <&CPU2 THERMAL_NO_LIMIT 7>;
};
map1 {
trip = <&cpu_warn2>;
cooling-device = <&CPU2 8 THERMAL_NO_LIMIT>;
trip = <&cpu2_alert0>;
cooling-device = <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
cpu-thermal3 {
cpu3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 10>;
trips {
cpu_alert3: cpu_alert3 {
cpu3_alert0: [email protected] {
temperature = <75000>;
hysteresis = <2000>;
type = "active";
};
cpu_crit3: trip1 {
cpu3_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -710,12 +698,158 @@
};
cooling-maps {
map0 {
trip = <&cpu_alert3>;
cooling-device = <&CPU2 THERMAL_NO_LIMIT 7>;
trip = <&cpu3_alert0>;
cooling-device = <&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
gpu-thermal-top {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 6>;
trips {
gpu1_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
gpu-thermal-bottom {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 7>;
trips {
gpu2_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
m4m-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 1>;
trips {
m4m_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
l3-or-venus-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 2>;
trips {
l3_or_venus_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
cluster0-l2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 7>;
trips {
cluster0_l2_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
cluster1-l2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 12>;
trips {
cluster1_l2_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
camera-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 1>;
trips {
camera_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
map1 {
trip = <&cpu_warn3>;
cooling-device = <&CPU2 8 THERMAL_NO_LIMIT>;
};
};
q6-dsp-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 2>;
trips {
q6_dsp_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
mem-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 3>;
trips {
mem_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
modemtx-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 4>;
trips {
modemtx_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
......
......@@ -78,7 +78,6 @@
compatible = "arm,armv8";
reg = <0x0 0x0>;
enable-method = "psci";
efficiency = <1024>;
next-level-cache = <&L2_0>;
L2_0: l2-cache {
compatible = "arm,arch-cache";
......@@ -97,7 +96,6 @@
compatible = "arm,armv8";
reg = <0x0 0x1>;
enable-method = "psci";
efficiency = <1024>;
next-level-cache = <&L2_0>;
L1_I_1: l1-icache {
compatible = "arm,arch-cache";
......@@ -112,7 +110,6 @@
compatible = "arm,armv8";
reg = <0x0 0x2>;
enable-method = "psci";
efficiency = <1024>;
next-level-cache = <&L2_0>;
L1_I_2: l1-icache {
compatible = "arm,arch-cache";
......@@ -127,7 +124,6 @@
compatible = "arm,armv8";
reg = <0x0 0x3>;
enable-method = "psci";
efficiency = <1024>;
next-level-cache = <&L2_0>;
L1_I_3: l1-icache {
compatible = "arm,arch-cache";
......@@ -142,7 +138,6 @@
compatible = "arm,armv8";
reg = <0x0 0x100>;
enable-method = "psci";
efficiency = <1536>;
next-level-cache = <&L2_1>;
L2_1: l2-cache {
compatible = "arm,arch-cache";
......@@ -161,7 +156,6 @@
compatible = "arm,armv8";
reg = <0x0 0x101>;
enable-method = "psci";
efficiency = <1536>;
next-level-cache = <&L2_1>;
L1_I_101: l1-icache {
compatible = "arm,arch-cache";
......@@ -176,7 +170,6 @@
compatible = "arm,armv8";
reg = <0x0 0x102>;
enable-method = "psci";
efficiency = <1536>;
next-level-cache = <&L2_1>;
L1_I_102: l1-icache {
compatible = "arm,arch-cache";
......@@ -191,7 +184,6 @@
compatible = "arm,armv8";
reg = <0x0 0x103>;
enable-method = "psci";
efficiency = <1536>;
next-level-cache = <&L2_1>;
L1_I_103: l1-icache {
compatible = "arm,arch-cache";
......@@ -346,20 +338,20 @@
};
thermal-zones {
cpu-thermal0 {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 6>;
thermal-sensors = <&tsens0 1>;
trips {
cpu_alert0: trip0 {
cpu0_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit0: trip1 {
cpu0_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -367,20 +359,20 @@
};
};
cpu-thermal1 {
cpu1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 7>;
thermal-sensors = <&tsens0 2>;
trips {
cpu_alert1: trip0 {
cpu1_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit1: trip1 {
cpu1_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -388,20 +380,20 @@
};
};
cpu-thermal2 {
cpu2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 8>;
thermal-sensors = <&tsens0 3>;
trips {
cpu_alert2: trip0 {
cpu2_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit2: trip1 {
cpu2_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -409,20 +401,20 @@
};
};
cpu-thermal3 {
cpu3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 9>;
thermal-sensors = <&tsens0 4>;
trips {
cpu_alert3: trip0 {
cpu3_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit3: trip1 {
cpu3_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -430,20 +422,20 @@
};
};
cpu-thermal4 {
cpu4-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 10>;
thermal-sensors = <&tsens0 7>;
trips {
cpu_alert4: trip0 {
cpu4_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit4: trip1 {
cpu4_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -451,20 +443,20 @@
};
};
cpu-thermal5 {
cpu5-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 11>;
thermal-sensors = <&tsens0 8>;
trips {
cpu_alert5: trip0 {
cpu5_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit5: trip1 {
cpu5_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -472,20 +464,20 @@
};
};
cpu-thermal6 {
cpu6-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 0>;
thermal-sensors = <&tsens0 9>;
trips {
cpu_alert6: trip0 {
cpu6_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit6: trip1 {
cpu6_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -493,20 +485,20 @@
};
};
cpu-thermal7 {
cpu7-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens1 1>;
thermal-sensors = <&tsens0 10>;
trips {
cpu_alert7: trip0 {
cpu7_alert0: [email protected]0 {
temperature = <75000>;
hysteresis = <2000>;
type = "passive";
};
cpu_crit7: trip1 {
cpu7_crit: cpu_crit {
temperature = <110000>;
hysteresis = <2000>;
type = "critical";
......@@ -514,11 +506,169 @@
};
};
gpu-thermal {
gpu-thermal-bottom {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 12>;
trips {
gpu1_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
gpu-thermal-top {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 13>;
trips {
gpu2_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
cluster0-mhm-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 5>;
trips {
cluster0_mhm_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
cluster1-mhm-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 6>;
trips {
cluster1_mhm_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
cluster1-l2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
thermal-sensors = <&tsens0 11>;
trips {
cluster1_l2_alert0: [email protected] {
temperature = <90000>;
hysteresis = <2000>;
type = "hot";
};
};
};
modem-thermal {