Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 3fdd8ea

Browse files
committed
Merge tag 'thermal-v6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux into thermal
Merge thermal drivers updates for 6.11-rc1 from Daniel Lezcano: "- Group all Renesas drivers inside a dedicated sub directory and add the missing dependency to OF (Niklas Söderlund) - Add suspend/resume support on k3_j72xx_bandgap and take the opportunity to remove a unneeded delay in the init time code path (Théo Lebrun) - Fix thermal zone definition for MT8186 and MT8188 (Julien Panis) - Convert hisilicon-thermal.txt to dt-schema (Abdulrasaq Lawani) - Add the DT bindings for the X1E80100 temperature sensor (Abel Vesa) - Fix the thermal zone node name regular expression in the DT schema (Krzysztof Kozlowski) - Take into account some production platforms may not have calibration data. Deal with it with a default value instead of failing the initialization (Chen-Yu Tsai) - Fix the sensor cell size on the Exynos platform (Krzysztof Kozlowski) - Bring the common definition of '#thermal-sensor-cells' property in order to simplify the bindings on all the platforms where this change makes sense and do some minor cleanups (Krzysztof Kozlowski) - Fix a race between removal and clock disable on the broadcom driver (Krzysztof Kozlowski) - Drop 'trips' node as required from the thermal zone bindings in order to fix the remaining warnings appearing with thermal zone whithout trip points defined (Rob Herring) - Simplify all the drivers where dev_err_probe() can apply (Krzysztof Kozlowski) - Cleanup code related to stih416 as this platform is not described anywhere (Raphael Gallais-Pou)" * tag 'thermal-v6.11-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (45 commits) thermal/drivers/sti: Cleanup code related to stih416 thermal/drivers/generic-adc: Simplify with dev_err_probe() thermal/drivers/generic-adc: Simplify probe() with local dev variable thermal/drivers/qcom-tsens: Simplify with dev_err_probe() thermal/drivers/qcom-spmi-adc-tm5: Simplify with dev_err_probe() thermal/drivers/imx: Simplify with dev_err_probe() thermal/drivers/imx: Simplify probe() with local dev variable thermal/drivers/hisi: Simplify with dev_err_probe() thermal/drivers/exynos: Simplify with dev_err_probe() thermal/drivers/exynos: Simplify probe() with local dev variable thermal/drivers/broadcom: Simplify with dev_err_probe() thermal/drivers/broadcom: Simplify probe() with local dev variable thermal/drivers/broadcom: Fix race between removal and clock disable dt-bindings: thermal: Drop 'trips' node as required dt-bindings: thermal: qoriq: reference thermal-sensor schema dt-bindings: thermal: cleanup examples indentation dt-bindings: thermal: simplify few bindings dt-bindings: thermal: ti,j72xx: reference thermal-sensor schema dt-bindings: thermal: ti,am654: reference thermal-sensor schema dt-bindings: thermal: st,stm32: reference thermal-sensor schema ...
2 parents 462be1c + e61cc85 commit 3fdd8ea

Some content is hidden

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

50 files changed

+531
-505
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ maintainers:
1010
- Vasily Khoruzhick <anarsoul@gmail.com>
1111
- Yangtao Li <tiny.windzz@gmail.com>
1212

13+
$ref: thermal-sensor.yaml#
14+
1315
properties:
1416
compatible:
1517
enum:
@@ -55,7 +57,6 @@ properties:
5557
maxItems: 1
5658
description: phandle to device controlling temperate offset SYS_CFG register
5759

58-
# See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for details
5960
"#thermal-sensor-cells":
6061
enum:
6162
- 0
@@ -135,9 +136,8 @@ required:
135136
- compatible
136137
- reg
137138
- interrupts
138-
- '#thermal-sensor-cells'
139139

140-
additionalProperties: false
140+
unevaluatedProperties: false
141141

142142
examples:
143143
- |

Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ maintainers:
1111

1212
description: Binding for Amlogic Thermal
1313

14+
$ref: thermal-sensor.yaml#
15+
1416
properties:
1517
compatible:
1618
oneOf:
@@ -44,17 +46,17 @@ required:
4446
- clocks
4547
- amlogic,ao-secure
4648

47-
additionalProperties: false
49+
unevaluatedProperties: false
4850

4951
examples:
5052
- |
51-
cpu_temp: temperature-sensor@ff634800 {
52-
compatible = "amlogic,g12a-cpu-thermal",
53-
"amlogic,g12a-thermal";
54-
reg = <0xff634800 0x50>;
55-
interrupts = <0x0 0x24 0x0>;
56-
clocks = <&clk 164>;
57-
#thermal-sensor-cells = <0>;
58-
amlogic,ao-secure = <&sec_AO>;
59-
};
53+
temperature-sensor@ff634800 {
54+
compatible = "amlogic,g12a-cpu-thermal",
55+
"amlogic,g12a-thermal";
56+
reg = <0xff634800 0x50>;
57+
interrupts = <0x0 0x24 0x0>;
58+
clocks = <&clk 164>;
59+
#thermal-sensor-cells = <0>;
60+
amlogic,ao-secure = <&sec_AO>;
61+
};
6062
...

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ description: |+
1919
Refer to the bindings described in
2020
Documentation/devicetree/bindings/mfd/syscon.yaml
2121
22+
$ref: thermal-sensor.yaml#
23+
2224
properties:
2325
compatible:
2426
const: brcm,bcm2711-thermal
2527

26-
# See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for details
2728
"#thermal-sensor-cells":
2829
const: 0
2930

3031
required:
3132
- compatible
32-
- '#thermal-sensor-cells'
3333

34-
additionalProperties: false
34+
unevaluatedProperties: false
3535

3636
examples:
3737
- |
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-
};
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>;
4746
};
47+
};
4848
...

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,14 @@ additionalProperties: false
4242
required:
4343
- compatible
4444
- reg
45-
- "#thermal-sensor-cells"
4645

4746
examples:
4847
- |
49-
thermal@f04d1500 {
50-
compatible = "brcm,avs-tmon-bcm7445", "brcm,avs-tmon";
51-
reg = <0xf04d1500 0x28>;
52-
interrupts = <0x6>;
53-
interrupt-names = "tmon";
54-
interrupt-parent = <&avs_host_l2_intc>;
55-
#thermal-sensor-cells = <0>;
56-
};
48+
thermal@f04d1500 {
49+
compatible = "brcm,avs-tmon-bcm7445", "brcm,avs-tmon";
50+
reg = <0xf04d1500 0x28>;
51+
interrupts = <0x6>;
52+
interrupt-names = "tmon";
53+
interrupt-parent = <&avs_host_l2_intc>;
54+
#thermal-sensor-cells = <0>;
55+
};

Documentation/devicetree/bindings/thermal/brcm,bcm2835-thermal.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ required:
3434
- compatible
3535
- reg
3636
- clocks
37-
- '#thermal-sensor-cells'
3837

3938
examples:
4039
- |

Documentation/devicetree/bindings/thermal/fsl,scu-thermal.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ properties:
2828

2929
required:
3030
- compatible
31-
- '#thermal-sensor-cells'
3231

3332
additionalProperties: false
3433

Documentation/devicetree/bindings/thermal/generic-adc-thermal.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ description:
1515
sensor resistor. The voltage read across the sensor is mapped to
1616
temperature using voltage-temperature lookup table.
1717

18+
$ref: thermal-sensor.yaml#
19+
1820
properties:
1921
compatible:
2022
const: generic-adc-thermal
@@ -44,11 +46,10 @@ properties:
4446

4547
required:
4648
- compatible
47-
- '#thermal-sensor-cells'
4849
- io-channels
4950
- io-channel-names
5051

51-
additionalProperties: false
52+
unevaluatedProperties: false
5253

5354
examples:
5455
- |
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/thermal/hisilicon,tsensor.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Temperature Sensor on HiSilicon SoCs
8+
9+
maintainers:
10+
- Abdulrasaq Lawani <abdulrasaqolawani@gmail.com>
11+
12+
allOf:
13+
- $ref: thermal-sensor.yaml
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- hisilicon,tsensor
19+
- hisilicon,hi3660-tsensor
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 1
26+
27+
clock-names:
28+
items:
29+
- const: thermal_clk
30+
31+
interrupts:
32+
maxItems: 1
33+
34+
'#thermal-sensor-cells':
35+
const: 1
36+
37+
required:
38+
- compatible
39+
- reg
40+
- interrupts
41+
- '#thermal-sensor-cells'
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/clock/hi6220-clock.h>
48+
#include <dt-bindings/interrupt-controller/arm-gic.h>
49+
50+
temperature-sensor@f7030700 {
51+
compatible = "hisilicon,tsensor";
52+
reg = <0xf7030700 0x1000>;
53+
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
54+
clocks = <&sys_ctrl HI6220_TSENSOR_CLK>;
55+
clock-names = "thermal_clk";
56+
#thermal-sensor-cells = <1>;
57+
};

Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ description: |
1616
for i.MX8MM which has ONLY 1 sensor, v2 is for i.MX8MP which has
1717
2 sensors.
1818
19+
$ref: thermal-sensor.yaml#
20+
1921
properties:
2022
compatible:
2123
oneOf:
@@ -51,9 +53,8 @@ required:
5153
- compatible
5254
- reg
5355
- clocks
54-
- '#thermal-sensor-cells'
5556

56-
additionalProperties: false
57+
unevaluatedProperties: false
5758

5859
examples:
5960
- |

0 commit comments

Comments
 (0)