Skip to content

Commit c280230

Browse files
torvaldstorvalds
committed
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal SoC updates from Eduardo Valentin: - Tegra DT binding documentation for Tegra194 - Armada now supports ap806 and cp110 - RCAR thermal now supports R8A774C0 and R8A77990 - Fixes on thermal_hwmon, IMX, generic-ADC, ST, RCAR, Broadcom, Uniphier, QCOM, Tegra, PowerClamp, and Armada thermal drivers. * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (22 commits) thermal: generic-adc: Fix adc to temp interpolation thermal: rcar_thermal: add R8A77990 support dt-bindings: thermal: rcar-thermal: add R8A77990 support thermal: rcar_thermal: add R8A774C0 support dt-bindings: thermal: rcar-thermal: add R8A774C0 support dt-bindings: cp110: document the thermal interrupt capabilities dt-bindings: ap806: document the thermal interrupt capabilities MAINTAINERS: thermal: add entry for Marvell MVEBU thermal driver thermal: armada: add overheat interrupt support thermal: st: fix Makefile typo thermal: uniphier: Convert to SPDX identifier thermal/intel_powerclamp: Change to use DEFINE_SHOW_ATTRIBUTE macro thermal: tegra: soctherm: Change to use DEFINE_SHOW_ATTRIBUTE macro dt-bindings: thermal: tegra-bpmp: Add Tegra194 support thermal: imx: save one condition block for normal case of nvmem initialization thermal: imx: fix for dependency on cpu-freq thermal: tsens: qcom: do not create duplicate regmap debugfs entries thermal: armada: Use PTR_ERR_OR_ZERO in armada_thermal_probe_legacy() dt-bindings: thermal: rcar-gen3-thermal: All variants use 3 interrupts thermal: broadcom: use devm_thermal_zone_of_sensor_register ...
2 parents a670124 + 9d21621 commit c280230

18 files changed

+383
-93
lines changed

‎Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,17 @@ Documentation/devicetree/bindings/thermal/thermal.txt
114114
The thermal IP can probe the temperature all around the processor. It
115115
may feature several channels, each of them wired to one sensor.
116116

117+
It is possible to setup an overheat interrupt by giving at least one
118+
critical point to any subnode of the thermal-zone node.
119+
117120
Required properties:
118121
- compatible: must be one of:
119122
* marvell,armada-ap806-thermal
120123
- reg: register range associated with the thermal functions.
121124

122125
Optional properties:
126+
- interrupts: overheat interrupt handle. Should point to line 18 of the
127+
SEI irqchip. See interrupt-controller/interrupts.txt
123128
- #thermal-sensor-cells: shall be <1> when thermal-zones subnodes refer
124129
to this IP and represents the channel ID. There is one sensor per
125130
channel. O refers to the thermal IP internal channel, while positive
@@ -133,6 +138,8 @@ ap_syscon1: system-controller@6f8000 {
133138
ap_thermal: thermal-sensor@80 {
134139
compatible = "marvell,armada-ap806-thermal";
135140
reg = <0x80 0x10>;
141+
interrupt-parent = <&sei>;
142+
interrupts = <18>;
136143
#thermal-sensor-cells = <1>;
137144
};
138145
};

‎Documentation/devicetree/bindings/arm/marvell/cp110-system-controller.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ Thermal:
199199
The thermal IP can probe the temperature all around the processor. It
200200
may feature several channels, each of them wired to one sensor.
201201

202+
It is possible to setup an overheat interrupt by giving at least one
203+
critical point to any subnode of the thermal-zone node.
204+
202205
For common binding part and usage, refer to
203206
Documentation/devicetree/bindings/thermal/thermal.txt
204207

@@ -208,6 +211,11 @@ Required properties:
208211
- reg: register range associated with the thermal functions.
209212

210213
Optional properties:
214+
- interrupts-extended: overheat interrupt handle. Should point to
215+
a line of the ICU-SEI irqchip (116 is what is usually used by the
216+
firmware). The ICU-SEI will redirect towards interrupt line #37 of the
217+
AP SEI which is shared across all CPs.
218+
See interrupt-controller/interrupts.txt
211219
- #thermal-sensor-cells: shall be <1> when thermal-zones subnodes refer
212220
to this IP and represents the channel ID. There is one sensor per
213221
channel. O refers to the thermal IP internal channel.
@@ -220,6 +228,7 @@ CP110_LABEL(syscon1): system-controller@6f8000 {
220228
CP110_LABEL(thermal): thermal-sensor@70 {
221229
compatible = "marvell,armada-cp110-thermal";
222230
reg = <0x70 0x10>;
231+
interrupts-extended = <&CP110_LABEL(icu_sei) 116 IRQ_TYPE_LEVEL_HIGH>;
223232
#thermal-sensor-cells = <1>;
224233
};
225234
};

‎Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ Required properties:
2121

2222
Optional properties:
2323

24-
- interrupts : interrupts routed to the TSC (3 for H3, M3-W, M3-N,
25-
and V3H)
24+
- interrupts : interrupts routed to the TSC (must be 3).
2625
- power-domain : Must contain a reference to the power domain. This
2726
property is mandatory if the thermal sensor instance
2827
is part of a controllable power domain.

‎Documentation/devicetree/bindings/thermal/rcar-thermal.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ Required properties:
44
- compatible : "renesas,thermal-<soctype>",
55
"renesas,rcar-gen2-thermal" (with thermal-zone) or
66
"renesas,rcar-thermal" (without thermal-zone) as
7-
fallback except R-Car V3M/D3.
7+
fallback except R-Car V3M/E3/D3 and RZ/G2E.
88
Examples with soctypes are:
99
- "renesas,thermal-r8a73a4" (R-Mobile APE6)
1010
- "renesas,thermal-r8a7743" (RZ/G1M)
1111
- "renesas,thermal-r8a7744" (RZ/G1N)
12+
- "renesas,thermal-r8a774c0" (RZ/G2E)
1213
- "renesas,thermal-r8a7779" (R-Car H1)
1314
- "renesas,thermal-r8a7790" (R-Car H2)
1415
- "renesas,thermal-r8a7791" (R-Car M2-W)
1516
- "renesas,thermal-r8a7792" (R-Car V2H)
1617
- "renesas,thermal-r8a7793" (R-Car M2-N)
1718
- "renesas,thermal-r8a77970" (R-Car V3M)
19+
- "renesas,thermal-r8a77990" (R-Car E3)
1820
- "renesas,thermal-r8a77995" (R-Car D3)
1921
- reg : Address range of the thermal registers.
2022
The 1st reg will be recognized as common register
@@ -23,7 +25,7 @@ Required properties:
2325
Option properties:
2426

2527
- interrupts : If present should contain 3 interrupts for
26-
R-Car V3M/D3 or 1 interrupt otherwise.
28+
R-Car V3M/E3/D3 and RZ/G2E or 1 interrupt otherwise.
2729

2830
Example (non interrupt support):
2931

‎MAINTAINERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9109,6 +9109,11 @@ L: netdev@vger.kernel.org
91099109
S: Maintained
91109110
F: drivers/net/phy/marvell10g.c
91119111

9112+
MARVELL MVEBU THERMAL DRIVER
9113+
M: Miquel Raynal <miquel.raynal@bootlin.com>
9114+
S: Maintained
9115+
F: drivers/thermal/armada_thermal.c
9116+
91129117
MARVELL MVNETA ETHERNET DRIVER
91139118
M: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
91149119
L: netdev@vger.kernel.org

‎drivers/thermal/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ config HISI_THERMAL
212212

213213
config IMX_THERMAL
214214
tristate "Temperature sensor driver for Freescale i.MX SoCs"
215-
depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST
215+
depends on ARCH_MXC || COMPILE_TEST
216216
depends on NVMEM || !NVMEM
217217
depends on MFD_SYSCON
218218
depends on OF

0 commit comments

Comments
 (0)