Skip to content

Commit 9f79762

Browse files
committed
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 3fd6d6e ("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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 33a0c1b + a3583e9 commit 9f79762

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

arch/arm/boot/dts/exynos4-cpu-thermal.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/ {
1111
thermal-zones {
1212
cpu_thermal: cpu-thermal {
13-
thermal-sensors = <&tmu 0>;
13+
thermal-sensors = <&tmu>;
1414
polling-delay-passive = <0>;
1515
polling-delay = <0>;
1616
trips {

arch/arm/boot/dts/exynos4210.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@
393393
&cpu_thermal {
394394
polling-delay-passive = <0>;
395395
polling-delay = <0>;
396-
thermal-sensors = <&tmu 0>;
397396
};
398397

399398
&gic {

arch/arm/boot/dts/exynos5250.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@
11071107
&cpu_thermal {
11081108
polling-delay-passive = <0>;
11091109
polling-delay = <0>;
1110-
thermal-sensors = <&tmu 0>;
1110+
thermal-sensors = <&tmu>;
11111111

11121112
cooling-maps {
11131113
map0 {

arch/arm/boot/dts/exynos5410-odroidxu.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
};
121121

122122
&cpu0_thermal {
123-
thermal-sensors = <&tmu_cpu0 0>;
124123
polling-delay-passive = <0>;
125124
polling-delay = <0>;
126125

arch/arm/boot/dts/exynos5422-odroidhc1.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
thermal-zones {
3333
cpu0_thermal: cpu0-thermal {
34-
thermal-sensors = <&tmu_cpu0 0>;
34+
thermal-sensors = <&tmu_cpu0>;
3535
trips {
3636
cpu0_alert0: cpu-alert-0 {
3737
temperature = <70000>; /* millicelsius */
@@ -86,7 +86,7 @@
8686
};
8787
};
8888
cpu1_thermal: cpu1-thermal {
89-
thermal-sensors = <&tmu_cpu1 0>;
89+
thermal-sensors = <&tmu_cpu1>;
9090
trips {
9191
cpu1_alert0: cpu-alert-0 {
9292
temperature = <70000>;
@@ -130,7 +130,7 @@
130130
};
131131
};
132132
cpu2_thermal: cpu2-thermal {
133-
thermal-sensors = <&tmu_cpu2 0>;
133+
thermal-sensors = <&tmu_cpu2>;
134134
trips {
135135
cpu2_alert0: cpu-alert-0 {
136136
temperature = <70000>;
@@ -174,7 +174,7 @@
174174
};
175175
};
176176
cpu3_thermal: cpu3-thermal {
177-
thermal-sensors = <&tmu_cpu3 0>;
177+
thermal-sensors = <&tmu_cpu3>;
178178
trips {
179179
cpu3_alert0: cpu-alert-0 {
180180
temperature = <70000>;
@@ -218,7 +218,7 @@
218218
};
219219
};
220220
gpu_thermal: gpu-thermal {
221-
thermal-sensors = <&tmu_gpu 0>;
221+
thermal-sensors = <&tmu_gpu>;
222222
trips {
223223
gpu_alert0: gpu-alert-0 {
224224
temperature = <70000>;

arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
thermal-zones {
5252
cpu0_thermal: cpu0-thermal {
53-
thermal-sensors = <&tmu_cpu0 0>;
53+
thermal-sensors = <&tmu_cpu0>;
5454
polling-delay-passive = <250>;
5555
polling-delay = <0>;
5656
trips {
@@ -139,7 +139,7 @@
139139
};
140140
};
141141
cpu1_thermal: cpu1-thermal {
142-
thermal-sensors = <&tmu_cpu1 0>;
142+
thermal-sensors = <&tmu_cpu1>;
143143
polling-delay-passive = <250>;
144144
polling-delay = <0>;
145145
trips {
@@ -212,7 +212,7 @@
212212
};
213213
};
214214
cpu2_thermal: cpu2-thermal {
215-
thermal-sensors = <&tmu_cpu2 0>;
215+
thermal-sensors = <&tmu_cpu2>;
216216
polling-delay-passive = <250>;
217217
polling-delay = <0>;
218218
trips {
@@ -285,7 +285,7 @@
285285
};
286286
};
287287
cpu3_thermal: cpu3-thermal {
288-
thermal-sensors = <&tmu_cpu3 0>;
288+
thermal-sensors = <&tmu_cpu3>;
289289
polling-delay-passive = <250>;
290290
polling-delay = <0>;
291291
trips {
@@ -358,7 +358,7 @@
358358
};
359359
};
360360
gpu_thermal: gpu-thermal {
361-
thermal-sensors = <&tmu_gpu 0>;
361+
thermal-sensors = <&tmu_gpu>;
362362
polling-delay-passive = <250>;
363363
polling-delay = <0>;
364364
trips {

0 commit comments

Comments
 (0)