From 8e046773c09da591f1f10e621fec0bd00a4ddcd7 Mon Sep 17 00:00:00 2001 From: Anurag Pateriya Date: Wed, 26 Aug 2026 20:39:21 +0530 Subject: [PATCH] Revert "PENDING: arm64: dts: qcom: nord: Add GPU cooling" This reverts commit e83f9576d0c02097750f49e0d5661856a761b2cd. This commit was failing compilation as discussed with submitter. This is dependent on other change whcih was not mentioned in the PR. Signed-off-by: Anurag Pateriya --- arch/arm64/boot/dts/qcom/nord-embedded.dtsi | 177 -------------------- arch/arm64/boot/dts/qcom/nord.dtsi | 80 ++++----- 2 files changed, 40 insertions(+), 217 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/nord-embedded.dtsi b/arch/arm64/boot/dts/qcom/nord-embedded.dtsi index 3997ec25f074..4f6d1fc61889 100644 --- a/arch/arm64/boot/dts/qcom/nord-embedded.dtsi +++ b/arch/arm64/boot/dts/qcom/nord-embedded.dtsi @@ -18,7 +18,6 @@ #include #include #include -#include #include "nord.dtsi" #include "pmm8650au-nord.dtsi" @@ -3880,179 +3879,3 @@ clock-names = "hlos"; power-domains = <&gpucc GPU_CC_CX_GDSC>; }; - -&gpu_0_0_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpu_0_0_0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpu_0_0_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpu_0_0_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpu_0_1_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpu_0_1_0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpu_0_1_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpu_0_1_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_0_1_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_0_1_0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_0_1_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_0_1_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_0_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_0_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_1_0_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_1_0_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_1_1_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_1_1_0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_1_1_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_1_1_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_2_0_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_2_0_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_2_1_0_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_2_1_0_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_2_1_1_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss_2_1_1_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; - -&gpuss_2_thermal { - polling-delay-passive = <10>; - - cooling-maps { - map0 { - trip = <&gpuss2_alert0>; - cooling-device = <&gpu_0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; -}; diff --git a/arch/arm64/boot/dts/qcom/nord.dtsi b/arch/arm64/boot/dts/qcom/nord.dtsi index 21d184480f44..feaa2a59d734 100644 --- a/arch/arm64/boot/dts/qcom/nord.dtsi +++ b/arch/arm64/boot/dts/qcom/nord.dtsi @@ -8500,13 +8500,13 @@ }; }; - gpuss_0_thermal: gpuss-0-thermal { + gpuss-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 1>; trips { - gpuss0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8520,13 +8520,13 @@ }; }; - gpuss_1_thermal: gpuss-1-thermal { + gpuss-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 2>; trips { - gpuss1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8540,13 +8540,13 @@ }; }; - gpuss_2_thermal: gpuss-2-thermal { + gpuss-2-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 3>; trips { - gpuss2_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8560,13 +8560,13 @@ }; }; - gpu_0_0_0_thermal: gpu-0-0-0-thermal { + gpu-0-0-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 4>; trips { - gpu_0_0_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8580,13 +8580,13 @@ }; }; - gpuss_1_0_thermal: gpuss-1-0-thermal { + gpuss-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 5>; trips { - gpuss_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8600,13 +8600,13 @@ }; }; - gpuss_1_1_thermal: gpuss-1-1-thermal { + gpuss-1-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 6>; trips { - gpuss_1_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8720,13 +8720,13 @@ }; }; - gpuss_0_1_1_thermal: gpuss-0-1-1-thermal { + gpuss-0-1-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 12>; trips { - gpuss_0_1_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8740,13 +8740,13 @@ }; }; - gpuss_1_1_1_thermal: gpuss-1-1-1-thermal { + gpuss-1-1-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 13>; trips { - gpuss_1_1_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8760,13 +8760,13 @@ }; }; - gpuss_2_1_1_thermal: gpuss-2-1-1-thermal { + gpuss-2-1-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 14>; trips { - gpuss_2_1_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8780,13 +8780,13 @@ }; }; - gpu_0_1_1_thermal: gpu-0-1-1-thermal { + gpu-0-1-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens6 15>; trips { - gpu_0_1_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8820,13 +8820,13 @@ }; }; - gpuss_0_1_0_thermal: gpuss-0-1-0-thermal { + gpuss-0-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 1>; trips { - gpuss_0_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8840,13 +8840,13 @@ }; }; - gpuss_1_1_0_thermal: gpuss-1-1-0-thermal { + gpuss-1-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 2>; trips { - gpuss_1_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8860,13 +8860,13 @@ }; }; - gpuss_2_1_0_thermal: gpuss-2-1-0-thermal { + gpuss-2-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 3>; trips { - gpuss_2_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8880,13 +8880,13 @@ }; }; - gpu_0_1_0_thermal: gpu-0-1-0-thermal { + gpu-0-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 4>; trips { - gpu_0_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8900,13 +8900,13 @@ }; }; - gpuss_1_2_thermal: gpuss-1-2-thermal { + gpuss-1-2-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 5>; trips { - gpuss_1_2_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -8920,13 +8920,13 @@ }; }; - gpu_1_0_thermal: gpu-1-0-thermal { + gpu-1-0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 6>; trips { - gpu_1_0_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -9040,13 +9040,13 @@ }; }; - gpuss_0_1_thermal: gpuss-0-1-thermal { + gpuss-0-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 12>; trips { - gpuss_0_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -9060,13 +9060,13 @@ }; }; - gpuss_1_0_1_thermal: gpuss-1-0-1-thermal { + gpuss-1-0-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 13>; trips { - gpuss_1_0_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -9080,13 +9080,13 @@ }; }; - gpuss_2_0_1_thermal: gpuss-2-0-1-thermal { + gpuss-2-0-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 14>; trips { - gpuss_2_0_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive"; @@ -9100,13 +9100,13 @@ }; }; - gpu_0_0_1_thermal: gpu-0-0-1-thermal { + gpu-0-0-1-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&tsens7 15>; trips { - gpu_0_0_1_alert0: trip-point0 { + trip-point0 { temperature = <105000>; hysteresis = <10000>; type = "passive";