Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal fixes from Eduardo Valentin:
"A couple of fixes for the thermal subsystem"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
dt-bindings: thermal: Remove "cooling-{min|max}-level" properties
dt-bindings: thermal: remove no longer needed samsung thermal properties
+6
-33
+5
-18
Documentation/devicetree/bindings/thermal/exynos-thermal.txt
+5
-18
Documentation/devicetree/bindings/thermal/exynos-thermal.txt
···
49
49
- samsung,exynos5433-tmu: 8
50
50
- samsung,exynos7-tmu: 8
51
51
52
-
Following properties are mandatory (depending on SoC):
53
-
- samsung,tmu_gain: Gain value for internal TMU operation.
54
-
- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage
55
-
- samsung,tmu_noise_cancel_mode: Mode for noise cancellation
56
-
- samsung,tmu_efuse_value: Default level of temperature - it is needed when
57
-
in factory fusing produced wrong value
58
-
- samsung,tmu_min_efuse_value: Minimum temperature fused value
59
-
- samsung,tmu_max_efuse_value: Maximum temperature fused value
60
-
- samsung,tmu_first_point_trim: First point trimming value
61
-
- samsung,tmu_second_point_trim: Second point trimming value
62
-
- samsung,tmu_default_temp_offset: Default temperature offset
63
-
- samsung,tmu_cal_type: Callibration type
64
-
65
52
** Optional properties:
66
53
67
54
- vtmu-supply: This entry is optional and provides the regulator node supplying
···
65
78
clocks = <&clock 383>;
66
79
clock-names = "tmu_apbif";
67
80
vtmu-supply = <&tmu_regulator_node>;
68
-
#include "exynos4412-tmu-sensor-conf.dtsi"
81
+
#thermal-sensor-cells = <0>;
69
82
};
70
83
71
84
Example 2):
···
76
89
interrupts = <0 58 0>;
77
90
clocks = <&clock 21>;
78
91
clock-names = "tmu_apbif";
79
-
#include "exynos5440-tmu-sensor-conf.dtsi"
92
+
#thermal-sensor-cells = <0>;
80
93
};
81
94
82
95
Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
···
86
99
interrupts = <0 184 0>;
87
100
clocks = <&clock 318>, <&clock 318>;
88
101
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
89
-
#include "exynos4412-tmu-sensor-conf.dtsi"
102
+
#thermal-sensor-cells = <0>;
90
103
};
91
104
92
105
tmu_cpu3: tmu@1006c000 {
···
95
108
interrupts = <0 185 0>;
96
109
clocks = <&clock 318>, <&clock 319>;
97
110
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
98
-
#include "exynos4412-tmu-sensor-conf.dtsi"
111
+
#thermal-sensor-cells = <0>;
99
112
};
100
113
101
114
tmu_gpu: tmu@100a0000 {
···
104
117
interrupts = <0 215 0>;
105
118
clocks = <&clock 319>, <&clock 318>;
106
119
clock-names = "tmu_apbif", "tmu_triminfo_apbif";
107
-
#include "exynos4412-tmu-sensor-conf.dtsi"
120
+
#thermal-sensor-cells = <0>;
108
121
};
109
122
110
123
Note: For multi-instance tmu each instance should have an alias correctly
+1
-15
Documentation/devicetree/bindings/thermal/thermal.txt
+1
-15
Documentation/devicetree/bindings/thermal/thermal.txt
···
55
55
the different fan speeds possible. Cooling states are referred to by
56
56
single unsigned integers, where larger numbers mean greater heat
57
57
dissipation. The precise set of cooling states associated with a device
58
-
(as referred to by the cooling-min-level and cooling-max-level
59
-
properties) should be defined in a particular device's binding.
58
+
should be defined in a particular device's binding.
60
59
For more examples of cooling devices, refer to the example sections below.
61
60
62
61
Required properties:
···
67
68
the maximum cooling state requested in the reference.
68
69
See Cooling device maps section below for more details
69
70
on how consumers refer to cooling devices.
70
-
71
-
Optional properties:
72
-
- cooling-min-level: An integer indicating the smallest
73
-
Type: unsigned cooling state accepted. Typically 0.
74
-
Size: one cell
75
-
76
-
- cooling-max-level: An integer indicating the largest
77
-
Type: unsigned cooling state accepted.
78
-
Size: one cell
79
71
80
72
* Trip points
81
73
···
216
226
396000 950000
217
227
198000 850000
218
228
>;
219
-
cooling-min-level = <0>;
220
-
cooling-max-level = <3>;
221
229
#cooling-cells = <2>; /* min followed by max */
222
230
};
223
231
...
···
229
241
*/
230
242
fan0: fan@48 {
231
243
...
232
-
cooling-min-level = <0>;
233
-
cooling-max-level = <9>;
234
244
#cooling-cells = <2>; /* min followed by max */
235
245
};
236
246
};