Skip to content

Commit abb22e4

Browse files
committed
Merge tag 'thermal-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal updates from Daniel Lezcano: - Depromote debug print on the db8500 platform (Linus Walleij) - Fix compilation warning when compiling with make W=1 (Amit Kucheria) - Code cleanup and refactoring, regmap conversion and add hwmon support on Qoriq (Andrey Smirnov) - Add an idle injection cpu cooling device and its documentation, rename the cpu_cooling device to cpufreq_cooling device (Daniel Lezcano) - Convert unexported functions to static, add the __init annotation in the thermal-of code and remove the pointless wrapper functions (Daniel Lezcano) - Fix register offset for Armada XP and register reset bit initialization (Zak Hays) - Enable hwmon on the rockchip (Stefan Schaeckeler) - Add the thermal sensor for the H6/H5/H3/A64/A83T/R40 sun8i platform and their device tree bindings, followed by a fix for the ths number and the sparse warnings (Yangtao Li) - Code cleansup for the sun8i and hwmon support (Yangtao Li) - Silent some messages which are misleading given the changes made in the previous version on generic-adc (Martin Blumenstingl) - Rename exynos to Exynos (Krzysztof Kozlowski) - Add the bcm2711 thermal driver with the device tree bindings (Stefan Wahren) - Use usleep_range() instead of udelay() as the call is always done in a sleep-able context (Geert Uytterhoeven) - Do code cleanup and re-organization to set the scene for a new process for the brcmstb (Florian Fainelli) - Fix bindings check issues on brcm (Stefan Wahren) - Add Jasper Lake support on int340x (Nivedita Swaminathan) - Add Comet Lake support on intel pch (Gayatri Kammela) - Fix unmatched pci_release_region() on x86 (Chuhong Yuan) - Remove temperature boundaries for rcar and rcar3 (Niklas Söderlund) - Fix return value to -ENODEV when thermal_zone_of_sensor_register() is called with the of-node is missing (Peter Mamonov) - Code cleanup, interrupt bouncing, and better support on stm32 (Pascal Paillet) * tag 'thermal-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (66 commits) thermal: stm32: Fix low threshold interrupt flood thermal: stm32: Improve temperature computing thermal: stm32: Handle multiple trip points thermal: stm32: Disable interrupts at probe thermal: stm32: Rework sensor mode management thermal: stm32: Fix icifr register name thermal: of: Make thermal_zone_of_sensor_register return -ENODEV if a sensor OF node is missing thermal: rcar_gen3_thermal: Remove temperature bound thermal: rcar_thermal: Remove temperature bound thermal: intel: intel_pch_thermal: Add Comet Lake (CML) platform support thermal: intel: Fix unmatched pci_release_region thermal: int340x: processor_thermal: Add Jasper Lake support dt-bindings: brcm,avs-ro-thermal: Fix binding check issues thermal: brcmstb_thermal: Register different ops per process thermal: brcmstb_thermal: Restructure interrupt registration thermal: brcmstb_thermal: Add 16nm process thermal parameters dt-bindings: thermal: Define BCM7216 thermal sensor compatible thermal: brcmstb_thermal: Prepare to support a different process thermal: brcmstb_thermal: Do not use DT coefficients thermal: rcar_thermal: Use usleep_range() instead of udelay() ...
2 parents fb95aae + 2f23e31 commit abb22e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2012
-590
lines changed
Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/thermal/allwinner,sun8i-a83t-ths.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Allwinner SUN8I Thermal Controller Device Tree Bindings
8+
9+
maintainers:
10+
- Vasily Khoruzhick <[email protected]>
11+
- Yangtao Li <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- allwinner,sun8i-a83t-ths
17+
- allwinner,sun8i-h3-ths
18+
- allwinner,sun8i-r40-ths
19+
- allwinner,sun50i-a64-ths
20+
- allwinner,sun50i-h5-ths
21+
- allwinner,sun50i-h6-ths
22+
23+
clocks:
24+
minItems: 1
25+
maxItems: 2
26+
items:
27+
- description: Bus Clock
28+
- description: Module Clock
29+
30+
clock-names:
31+
minItems: 1
32+
maxItems: 2
33+
items:
34+
- const: bus
35+
- const: mod
36+
37+
reg:
38+
maxItems: 1
39+
40+
interrupts:
41+
maxItems: 1
42+
43+
resets:
44+
maxItems: 1
45+
46+
nvmem-cells:
47+
maxItems: 1
48+
description: Calibration data for thermal sensors
49+
50+
nvmem-cell-names:
51+
const: calibration
52+
53+
# See ./thermal.txt for details
54+
"#thermal-sensor-cells":
55+
enum:
56+
- 0
57+
- 1
58+
59+
allOf:
60+
- if:
61+
properties:
62+
compatible:
63+
contains:
64+
const: allwinner,sun50i-h6-ths
65+
66+
then:
67+
properties:
68+
clocks:
69+
maxItems: 1
70+
71+
clock-names:
72+
maxItems: 1
73+
74+
else:
75+
properties:
76+
clocks:
77+
minItems: 2
78+
79+
clock-names:
80+
minItems: 2
81+
82+
- if:
83+
properties:
84+
compatible:
85+
contains:
86+
const: allwinner,sun8i-h3-ths
87+
88+
then:
89+
properties:
90+
"#thermal-sensor-cells":
91+
const: 0
92+
93+
else:
94+
properties:
95+
"#thermal-sensor-cells":
96+
const: 1
97+
98+
- if:
99+
properties:
100+
compatible:
101+
contains:
102+
enum:
103+
- const: allwinner,sun8i-h3-ths
104+
- const: allwinner,sun8i-r40-ths
105+
- const: allwinner,sun50i-a64-ths
106+
- const: allwinner,sun50i-h5-ths
107+
- const: allwinner,sun50i-h6-ths
108+
109+
then:
110+
required:
111+
- clocks
112+
- clock-names
113+
- resets
114+
115+
required:
116+
- compatible
117+
- reg
118+
- interrupts
119+
- '#thermal-sensor-cells'
120+
121+
additionalProperties: false
122+
123+
examples:
124+
- |
125+
thermal-sensor@1f04000 {
126+
compatible = "allwinner,sun8i-a83t-ths";
127+
reg = <0x01f04000 0x100>;
128+
interrupts = <0 31 0>;
129+
nvmem-cells = <&ths_calibration>;
130+
nvmem-cell-names = "calibration";
131+
#thermal-sensor-cells = <1>;
132+
};
133+
134+
- |
135+
thermal-sensor@1c25000 {
136+
compatible = "allwinner,sun8i-h3-ths";
137+
reg = <0x01c25000 0x400>;
138+
clocks = <&ccu 0>, <&ccu 1>;
139+
clock-names = "bus", "mod";
140+
resets = <&ccu 2>;
141+
interrupts = <0 31 0>;
142+
nvmem-cells = <&ths_calibration>;
143+
nvmem-cell-names = "calibration";
144+
#thermal-sensor-cells = <0>;
145+
};
146+
147+
- |
148+
thermal-sensor@5070400 {
149+
compatible = "allwinner,sun50i-h6-ths";
150+
reg = <0x05070400 0x100>;
151+
clocks = <&ccu 0>;
152+
clock-names = "bus";
153+
resets = <&ccu 2>;
154+
interrupts = <0 15 0>;
155+
nvmem-cells = <&ths_calibration>;
156+
nvmem-cell-names = "calibration";
157+
#thermal-sensor-cells = <1>;
158+
};
159+
160+
...
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/thermal/brcm,avs-ro-thermal.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom AVS ring oscillator thermal
8+
9+
maintainers:
10+
- Stefan Wahren <[email protected]>
11+
12+
description: |+
13+
The thermal node should be the child of a syscon node with the
14+
required property:
15+
16+
- compatible: Should be one of the following:
17+
"brcm,bcm2711-avs-monitor", "syscon", "simple-mfd"
18+
19+
Refer to the the bindings described in
20+
Documentation/devicetree/bindings/mfd/syscon.txt
21+
22+
properties:
23+
compatible:
24+
const: brcm,bcm2711-thermal
25+
26+
# See ./thermal.txt for details
27+
"#thermal-sensor-cells":
28+
const: 0
29+
30+
required:
31+
- compatible
32+
- '#thermal-sensor-cells'
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
avs-monitor@7d5d2000 {
39+
compatible = "brcm,bcm2711-avs-monitor",
40+
"syscon", "simple-mfd";
41+
reg = <0x7d5d2000 0xf00>;
42+
43+
thermal: thermal {
44+
compatible = "brcm,bcm2711-thermal";
45+
#thermal-sensor-cells = <0>;
46+
};
47+
};
48+
...

Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
Thermal management core, provided by the AVS TMON hardware block.
44

55
Required properties:
6-
- compatible: must be "brcm,avs-tmon" and/or "brcm,avs-tmon-bcm7445"
6+
- compatible: must be one of:
7+
"brcm,avs-tmon-bcm7216"
8+
"brcm,avs-tmon-bcm7445"
9+
"brcm,avs-tmon"
710
- reg: address range for the AVS TMON registers
8-
- interrupts: temperature monitor interrupt, for high/low threshold triggers
11+
- interrupts: temperature monitor interrupt, for high/low threshold triggers,
12+
required except for "brcm,avs-tmon-bcm7216"
913
- interrupt-names: should be "tmon"
1014

1115
Example:

0 commit comments

Comments
 (0)