Skip to content

Commit 8868485

Browse files
committed
Merge tag 'thermal-6.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more thermal control updates from Rafael Wysocki: "These are mostly assorted updates of thermal drivers used on ARM platforms: - Use dev_err_probe() helpers to simplify the init code in the Qoriq thermal driver (Frank Li) - Power down the Qoriq's TMU at suspend time (Alice Guo) - Add ipq5332, ipq5424 compatible to the QCom's tsens thermal driver and TSENS enable / calibration support for V2 (Praveenkumar I) - Add missing rk3328 mapping entry (Trevor Woerner) - Remove duplicate struct declaration from the thermal core header file (Xueqin Luo) - Disable the monitoring mode during suspend in the LVTS Mediatek driver to prevent temperature acquisition glitches (Nícolas F. R. A. Prado) - Disable Stage 3 thermal threshold in the LVTS Mediatek driver because it disables the suspend ability and does not have an interrupt handler (Nícolas F. R. A. Prado) - Fix low temperature offset interrupt in the LVTS Mediatek driver to prevent multiple interrupts from triggering when the system is at its normal functionning temperature (Nícolas F. R. A. Prado) - Enable interrupts in the LVTS Mediatek driver only on sensors that are in use (Nícolas F. R. A. Prado) - Add the BCM74110 compatible DT binding and the corresponding code to support a chip based on a different process node than previous chips (Florian Fainelli) - Correct indentation and style in DTS example (Krzysztof Kozlowski) - Unify hexadecimal annotatation in the rcar_gen3 driver (Niklas Söderlund) - Factor out the code logic to read fuses on Gen3 and Gen4 in the rcar_gen3 thermal driver (Niklas Söderlund) - Drop unused driver data from the QCom's spmi temperature alarm driver (Johan Hovold)" * tag 'thermal-6.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal/drivers/qcom-spmi-temp-alarm: Drop unused driver data thermal: rcar_gen3: Reuse logic to read fuses on Gen3 and Gen4 thermal: rcar_gen3: Use lowercase hex constants dt-bindings: thermal: Correct indentation and style in DTS example thermal/drivers/brcmstb_thermal: Add support for BCM74110 dt-bindings: thermal: Update for BCM74110 thermal/drivers/mediatek/lvts: Only update IRQ enable for valid sensors thermal/drivers/mediatek/lvts: Start sensor interrupts disabled thermal/drivers/mediatek/lvts: Disable low offset IRQ for minimum threshold thermal/drivers/mediatek/lvts: Disable Stage 3 thermal threshold thermal/drivers/mediatek/lvts: Disable monitor mode during suspend thermal: core: Remove duplicate struct declaration thermal/drivers/rockchip: Add missing rk3328 mapping entry thermal/drivers/tsens: Add TSENS enable and calibration support for V2 dt-bindings: thermal: tsens: Add ipq5332, ipq5424 compatible thermal/drivers/qoriq: Power down TMU on system suspend thermal/drivers/qoriq: Use dev_err_probe() simplify the code
2 parents 1df7752 + 12da0fe commit 8868485

File tree

15 files changed

+409
-167
lines changed

15 files changed

+409
-167
lines changed

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -142,38 +142,38 @@ unevaluatedProperties: false
142142
examples:
143143
- |
144144
thermal-sensor@1f04000 {
145-
compatible = "allwinner,sun8i-a83t-ths";
146-
reg = <0x01f04000 0x100>;
147-
interrupts = <0 31 0>;
148-
nvmem-cells = <&ths_calibration>;
149-
nvmem-cell-names = "calibration";
150-
#thermal-sensor-cells = <1>;
145+
compatible = "allwinner,sun8i-a83t-ths";
146+
reg = <0x01f04000 0x100>;
147+
interrupts = <0 31 0>;
148+
nvmem-cells = <&ths_calibration>;
149+
nvmem-cell-names = "calibration";
150+
#thermal-sensor-cells = <1>;
151151
};
152152
153153
- |
154154
thermal-sensor@1c25000 {
155-
compatible = "allwinner,sun8i-h3-ths";
156-
reg = <0x01c25000 0x400>;
157-
clocks = <&ccu 0>, <&ccu 1>;
158-
clock-names = "bus", "mod";
159-
resets = <&ccu 2>;
160-
interrupts = <0 31 0>;
161-
nvmem-cells = <&ths_calibration>;
162-
nvmem-cell-names = "calibration";
163-
#thermal-sensor-cells = <0>;
155+
compatible = "allwinner,sun8i-h3-ths";
156+
reg = <0x01c25000 0x400>;
157+
clocks = <&ccu 0>, <&ccu 1>;
158+
clock-names = "bus", "mod";
159+
resets = <&ccu 2>;
160+
interrupts = <0 31 0>;
161+
nvmem-cells = <&ths_calibration>;
162+
nvmem-cell-names = "calibration";
163+
#thermal-sensor-cells = <0>;
164164
};
165165
166166
- |
167167
thermal-sensor@5070400 {
168-
compatible = "allwinner,sun50i-h6-ths";
169-
reg = <0x05070400 0x100>;
170-
clocks = <&ccu 0>;
171-
clock-names = "bus";
172-
resets = <&ccu 2>;
173-
interrupts = <0 15 0>;
174-
nvmem-cells = <&ths_calibration>;
175-
nvmem-cell-names = "calibration";
176-
#thermal-sensor-cells = <1>;
168+
compatible = "allwinner,sun50i-h6-ths";
169+
reg = <0x05070400 0x100>;
170+
clocks = <&ccu 0>;
171+
clock-names = "bus";
172+
resets = <&ccu 2>;
173+
interrupts = <0 15 0>;
174+
nvmem-cells = <&ths_calibration>;
175+
nvmem-cell-names = "calibration";
176+
#thermal-sensor-cells = <1>;
177177
};
178178
179179
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
items:
2020
- enum:
21+
- brcm,avs-tmon-bcm74110
2122
- brcm,avs-tmon-bcm7216
2223
- brcm,avs-tmon-bcm7445
2324
- const: brcm,avs-tmon

Documentation/devicetree/bindings/thermal/imx-thermal.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ examples:
8080
#include <dt-bindings/interrupt-controller/arm-gic.h>
8181
8282
efuse@21bc000 {
83-
#address-cells = <1>;
84-
#size-cells = <1>;
85-
compatible = "fsl,imx6sx-ocotp", "syscon";
86-
reg = <0x021bc000 0x4000>;
87-
clocks = <&clks IMX6SX_CLK_OCOTP>;
88-
89-
tempmon_calib: calib@38 {
90-
reg = <0x38 4>;
91-
};
92-
93-
tempmon_temp_grade: temp-grade@20 {
94-
reg = <0x20 4>;
95-
};
83+
#address-cells = <1>;
84+
#size-cells = <1>;
85+
compatible = "fsl,imx6sx-ocotp", "syscon";
86+
reg = <0x021bc000 0x4000>;
87+
clocks = <&clks IMX6SX_CLK_OCOTP>;
88+
89+
tempmon_calib: calib@38 {
90+
reg = <0x38 4>;
91+
};
92+
93+
tempmon_temp_grade: temp-grade@20 {
94+
reg = <0x20 4>;
95+
};
9696
};
9797
9898
anatop@20c8000 {
@@ -103,12 +103,12 @@ examples:
103103
<0 127 IRQ_TYPE_LEVEL_HIGH>;
104104
105105
tempmon {
106-
compatible = "fsl,imx6sx-tempmon";
107-
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
108-
fsl,tempmon = <&anatop>;
109-
nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
110-
nvmem-cell-names = "calib", "temp_grade";
111-
clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
112-
#thermal-sensor-cells = <0>;
106+
compatible = "fsl,imx6sx-tempmon";
107+
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
108+
fsl,tempmon = <&anatop>;
109+
nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
110+
nvmem-cell-names = "calib", "temp_grade";
111+
clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
112+
#thermal-sensor-cells = <0>;
113113
};
114114
};

Documentation/devicetree/bindings/thermal/imx8mm-thermal.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ examples:
6363
#include <dt-bindings/clock/imx8mm-clock.h>
6464
6565
thermal-sensor@30260000 {
66-
compatible = "fsl,imx8mm-tmu";
67-
reg = <0x30260000 0x10000>;
68-
clocks = <&clk IMX8MM_CLK_TMU_ROOT>;
69-
#thermal-sensor-cells = <0>;
66+
compatible = "fsl,imx8mm-tmu";
67+
reg = <0x30260000 0x10000>;
68+
clocks = <&clk IMX8MM_CLK_TMU_ROOT>;
69+
#thermal-sensor-cells = <0>;
7070
};
7171
7272
...

Documentation/devicetree/bindings/thermal/qcom-tsens.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ properties:
7575

7676
- description: v2 of TSENS with combined interrupt
7777
enum:
78+
- qcom,ipq5332-tsens
79+
- qcom,ipq5424-tsens
7880
- qcom,ipq8074-tsens
7981

8082
- description: v2 of TSENS with combined interrupt
@@ -212,6 +214,18 @@ properties:
212214
- const: s9_p2_backup
213215
- const: s10_p1_backup
214216
- const: s10_p2_backup
217+
- minItems: 8
218+
items:
219+
- const: mode
220+
- const: base0
221+
- const: base1
222+
- pattern: '^tsens_sens[0-9]+_off$'
223+
- pattern: '^tsens_sens[0-9]+_off$'
224+
- pattern: '^tsens_sens[0-9]+_off$'
225+
- pattern: '^tsens_sens[0-9]+_off$'
226+
- pattern: '^tsens_sens[0-9]+_off$'
227+
- pattern: '^tsens_sens[0-9]+_off$'
228+
- pattern: '^tsens_sens[0-9]+_off$'
215229

216230
"#qcom,sensors":
217231
description:
@@ -271,6 +285,8 @@ allOf:
271285
compatible:
272286
contains:
273287
enum:
288+
- qcom,ipq5332-tsens
289+
- qcom,ipq5424-tsens
274290
- qcom,ipq8074-tsens
275291
then:
276292
properties:
@@ -286,6 +302,8 @@ allOf:
286302
compatible:
287303
contains:
288304
enum:
305+
- qcom,ipq5332-tsens
306+
- qcom,ipq5424-tsens
289307
- qcom,ipq8074-tsens
290308
- qcom,tsens-v0_1
291309
- qcom,tsens-v1

drivers/thermal/broadcom/brcmstb_thermal.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,20 @@ static int brcmstb_set_trips(struct thermal_zone_device *tz, int low, int high)
286286
return 0;
287287
}
288288

289-
static const struct thermal_zone_device_ops brcmstb_16nm_of_ops = {
289+
static const struct thermal_zone_device_ops brcmstb_of_ops = {
290290
.get_temp = brcmstb_get_temp,
291291
};
292292

293+
static const struct brcmstb_thermal_params brcmstb_8nm_params = {
294+
.offset = 418670,
295+
.mult = 509,
296+
.of_ops = &brcmstb_of_ops,
297+
};
298+
293299
static const struct brcmstb_thermal_params brcmstb_16nm_params = {
294300
.offset = 457829,
295301
.mult = 557,
296-
.of_ops = &brcmstb_16nm_of_ops,
302+
.of_ops = &brcmstb_of_ops,
297303
};
298304

299305
static const struct thermal_zone_device_ops brcmstb_28nm_of_ops = {
@@ -308,6 +314,7 @@ static const struct brcmstb_thermal_params brcmstb_28nm_params = {
308314
};
309315

310316
static const struct of_device_id brcmstb_thermal_id_table[] = {
317+
{ .compatible = "brcm,avs-tmon-bcm74110", .data = &brcmstb_8nm_params },
311318
{ .compatible = "brcm,avs-tmon-bcm7216", .data = &brcmstb_16nm_params },
312319
{ .compatible = "brcm,avs-tmon", .data = &brcmstb_28nm_params },
313320
{},

0 commit comments

Comments
 (0)