Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'samsung-dt-fixes-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes

Fixes for Samsung DTS ARM for v6.3

Thermal framework commit 3fd6d6e2b4e8 ("thermal/of: Rework the thermal
device tree initialization") merged in v6.1-rc1, exposed
misconfiguration of Exynos Thermal Monitoring Unit (TMU) thermal-sensors
property in DTS. This misconfiguration in DTS was working fine before
that Thermal commit, but now all thermal zones fail to register except
the first one (CPU). This can lead to missing cooling of a board and
eventually either emergency shutdown or damaged board.

* tag 'samsung-dt-fixes-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: exynos: correct TMU phandle in Odroid XU3 family
ARM: dts: exynos: correct TMU phandle in Odroid HC1
ARM: dts: exynos: correct TMU phandle in Odroid XU
ARM: dts: exynos: correct TMU phandle in Exynos5250
ARM: dts: exynos: correct TMU phandle in Exynos4210
ARM: dts: exynos: correct TMU phandle in Exynos4

Link: https://lore.kernel.org/r/20230221095337.9453-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+12 -14
+1 -1
arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
··· 10 10 / { 11 11 thermal-zones { 12 12 cpu_thermal: cpu-thermal { 13 - thermal-sensors = <&tmu 0>; 13 + thermal-sensors = <&tmu>; 14 14 polling-delay-passive = <0>; 15 15 polling-delay = <0>; 16 16 trips {
-1
arch/arm/boot/dts/exynos4210.dtsi
··· 393 393 &cpu_thermal { 394 394 polling-delay-passive = <0>; 395 395 polling-delay = <0>; 396 - thermal-sensors = <&tmu 0>; 397 396 }; 398 397 399 398 &gic {
+1 -1
arch/arm/boot/dts/exynos5250.dtsi
··· 1107 1107 &cpu_thermal { 1108 1108 polling-delay-passive = <0>; 1109 1109 polling-delay = <0>; 1110 - thermal-sensors = <&tmu 0>; 1110 + thermal-sensors = <&tmu>; 1111 1111 1112 1112 cooling-maps { 1113 1113 map0 {
-1
arch/arm/boot/dts/exynos5410-odroidxu.dts
··· 120 120 }; 121 121 122 122 &cpu0_thermal { 123 - thermal-sensors = <&tmu_cpu0 0>; 124 123 polling-delay-passive = <0>; 125 124 polling-delay = <0>; 126 125
+5 -5
arch/arm/boot/dts/exynos5422-odroidhc1.dts
··· 31 31 32 32 thermal-zones { 33 33 cpu0_thermal: cpu0-thermal { 34 - thermal-sensors = <&tmu_cpu0 0>; 34 + thermal-sensors = <&tmu_cpu0>; 35 35 trips { 36 36 cpu0_alert0: cpu-alert-0 { 37 37 temperature = <70000>; /* millicelsius */ ··· 86 86 }; 87 87 }; 88 88 cpu1_thermal: cpu1-thermal { 89 - thermal-sensors = <&tmu_cpu1 0>; 89 + thermal-sensors = <&tmu_cpu1>; 90 90 trips { 91 91 cpu1_alert0: cpu-alert-0 { 92 92 temperature = <70000>; ··· 130 130 }; 131 131 }; 132 132 cpu2_thermal: cpu2-thermal { 133 - thermal-sensors = <&tmu_cpu2 0>; 133 + thermal-sensors = <&tmu_cpu2>; 134 134 trips { 135 135 cpu2_alert0: cpu-alert-0 { 136 136 temperature = <70000>; ··· 174 174 }; 175 175 }; 176 176 cpu3_thermal: cpu3-thermal { 177 - thermal-sensors = <&tmu_cpu3 0>; 177 + thermal-sensors = <&tmu_cpu3>; 178 178 trips { 179 179 cpu3_alert0: cpu-alert-0 { 180 180 temperature = <70000>; ··· 218 218 }; 219 219 }; 220 220 gpu_thermal: gpu-thermal { 221 - thermal-sensors = <&tmu_gpu 0>; 221 + thermal-sensors = <&tmu_gpu>; 222 222 trips { 223 223 gpu_alert0: gpu-alert-0 { 224 224 temperature = <70000>;
+5 -5
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
··· 50 50 51 51 thermal-zones { 52 52 cpu0_thermal: cpu0-thermal { 53 - thermal-sensors = <&tmu_cpu0 0>; 53 + thermal-sensors = <&tmu_cpu0>; 54 54 polling-delay-passive = <250>; 55 55 polling-delay = <0>; 56 56 trips { ··· 139 139 }; 140 140 }; 141 141 cpu1_thermal: cpu1-thermal { 142 - thermal-sensors = <&tmu_cpu1 0>; 142 + thermal-sensors = <&tmu_cpu1>; 143 143 polling-delay-passive = <250>; 144 144 polling-delay = <0>; 145 145 trips { ··· 212 212 }; 213 213 }; 214 214 cpu2_thermal: cpu2-thermal { 215 - thermal-sensors = <&tmu_cpu2 0>; 215 + thermal-sensors = <&tmu_cpu2>; 216 216 polling-delay-passive = <250>; 217 217 polling-delay = <0>; 218 218 trips { ··· 285 285 }; 286 286 }; 287 287 cpu3_thermal: cpu3-thermal { 288 - thermal-sensors = <&tmu_cpu3 0>; 288 + thermal-sensors = <&tmu_cpu3>; 289 289 polling-delay-passive = <250>; 290 290 polling-delay = <0>; 291 291 trips { ··· 358 358 }; 359 359 }; 360 360 gpu_thermal: gpu-thermal { 361 - thermal-sensors = <&tmu_gpu 0>; 361 + thermal-sensors = <&tmu_gpu>; 362 362 polling-delay-passive = <250>; 363 363 polling-delay = <0>; 364 364 trips {