arm64: dts: qcom: x1e80100: Drop unused passive thermal trip points for CPU

There are currently two passive trip points defined for the CPU, but no
cooling devices are attached to the thermal zones. We don't have support
for cpufreq upstream yet, but actually this is redundant anyway because the
CPU is throttled automatically when reaching high temperatures.

Drop the passive trip points and keep just the critical shutdown as safety
measure in case the throttling fails.

Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20250219-x1e80100-thermal-fixes-v1-4-d110e44ac3f9@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 9382a2fce2f34eedcee172be965ccef34cacc111..46b79fce92c90d969e3de48bc88e27915d1592bb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -8479,23 +8479,9 @@
                };
 
                cpu0-0-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 1>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8505,23 +8491,9 @@
                };
 
                cpu0-0-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 2>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8531,23 +8503,9 @@
                };
 
                cpu0-1-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 3>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8557,23 +8515,9 @@
                };
 
                cpu0-1-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 4>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8583,23 +8527,9 @@
                };
 
                cpu0-2-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 5>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8609,23 +8539,9 @@
                };
 
                cpu0-2-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 6>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8635,23 +8551,9 @@
                };
 
                cpu0-3-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 7>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8661,23 +8563,9 @@
                };
 
                cpu0-3-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens0 8>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8690,12 +8578,6 @@
                        thermal-sensors = <&tsens0 9>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8708,12 +8590,6 @@
                        thermal-sensors = <&tsens0 10>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8777,23 +8653,9 @@
                };
 
                cpu1-0-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 1>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8803,23 +8665,9 @@
                };
 
                cpu1-0-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 2>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8829,23 +8677,9 @@
                };
 
                cpu1-1-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 3>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8855,23 +8689,9 @@
                };
 
                cpu1-1-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 4>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8881,23 +8701,9 @@
                };
 
                cpu1-2-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 5>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8907,23 +8713,9 @@
                };
 
                cpu1-2-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 6>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8933,23 +8725,9 @@
                };
 
                cpu1-3-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 7>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8959,23 +8737,9 @@
                };
 
                cpu1-3-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens1 8>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -8988,12 +8752,6 @@
                        thermal-sensors = <&tsens1 9>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9006,12 +8764,6 @@
                        thermal-sensors = <&tsens1 10>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9039,23 +8791,9 @@
                };
 
                cpu2-0-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 1>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9065,23 +8803,9 @@
                };
 
                cpu2-0-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 2>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9091,23 +8815,9 @@
                };
 
                cpu2-1-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 3>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9117,23 +8827,9 @@
                };
 
                cpu2-1-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 4>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9143,23 +8839,9 @@
                };
 
                cpu2-2-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 5>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9169,23 +8851,9 @@
                };
 
                cpu2-2-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 6>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9195,23 +8863,9 @@
                };
 
                cpu2-3-top-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 7>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9221,23 +8875,9 @@
                };
 
                cpu2-3-btm-thermal {
-                       polling-delay-passive = <250>;
-
                        thermal-sensors = <&tsens2 8>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
-                               trip-point1 {
-                                       temperature = <95000>;
-                                       hysteresis = <2000>;
-                                       type = "passive";
-                               };
-
                                cpu-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9250,12 +8890,6 @@
                        thermal-sensors = <&tsens2 9>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;
@@ -9268,12 +8902,6 @@
                        thermal-sensors = <&tsens2 10>;
 
                        trips {
-                               trip-point0 {
-                                       temperature = <90000>;
-                                       hysteresis = <2000>;
-                                       type = "hot";
-                               };
-
                                cpuss2-critical {
                                        temperature = <115000>;
                                        hysteresis = <1000>;