Commit 3fdd8ea3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'thermal-v6.11-rc1' of...

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
  ...
parents 462be1c3 e61cc85e
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ maintainers:
  - Vasily Khoruzhick <anarsoul@gmail.com>
  - Yangtao Li <tiny.windzz@gmail.com>

$ref: thermal-sensor.yaml#

properties:
  compatible:
    enum:
@@ -55,7 +57,6 @@ properties:
    maxItems: 1
    description: phandle to device controlling temperate offset SYS_CFG register

  # See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for details
  "#thermal-sensor-cells":
    enum:
      - 0
@@ -135,9 +136,8 @@ required:
  - compatible
  - reg
  - interrupts
  - '#thermal-sensor-cells'

additionalProperties: false
unevaluatedProperties: false

examples:
  - |
+12 −10
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ maintainers:

description: Binding for Amlogic Thermal

$ref: thermal-sensor.yaml#

properties:
  compatible:
    oneOf:
@@ -44,11 +46,11 @@ required:
  - clocks
  - amlogic,ao-secure

additionalProperties: false
unevaluatedProperties: false

examples:
  - |
        cpu_temp: temperature-sensor@ff634800 {
    temperature-sensor@ff634800 {
        compatible = "amlogic,g12a-cpu-thermal",
                     "amlogic,g12a-thermal";
        reg = <0xff634800 0x50>;
+12 −12
Original line number Diff line number Diff line
@@ -19,19 +19,19 @@ description: |+
  Refer to the bindings described in
  Documentation/devicetree/bindings/mfd/syscon.yaml

$ref: thermal-sensor.yaml#

properties:
  compatible:
    const: brcm,bcm2711-thermal

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

required:
  - compatible
  - '#thermal-sensor-cells'

additionalProperties: false
unevaluatedProperties: false

examples:
  - |
+8 −9
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ additionalProperties: false
required:
  - compatible
  - reg
  - "#thermal-sensor-cells"

examples:
  - |
+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ required:
  - compatible
  - reg
  - clocks
  - '#thermal-sensor-cells'

examples:
  - |
Loading