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

Merge tag 'thermal-v6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

Merge updates of thermal drivers for 6.18-rc1 from Daniel Lezcano:

"- Add the QCS615 compatible DT bindings for QCom platforms (Gaurav
   Kohli)

 - Support fallback trimming values when the fuse is empty in the R-Car
   driver (Marek Vasut)

 - Remove unneeded semicolon in the Mediatek LVTS driver (Jiapeng
   Chong)

 - Fix the LMH Kconfig option by selecting QCOM_SCM and take the
   opportunity to add the COMPILE_TEST option for the QCom's LMH
   feature (Dmitry Baryshkov)

 - Fix the missing includes and incorrect error message in the Qcom's
   LMH driver (Dmitry Baryshkov)

 - Fix comment typo and add the documentation in the Kconfig for the
   R-Car Gen3 and Gen4 (Marek Vasut)

 - Add Tegra114 SOCTHERM support (Svyatoslav Ryhel)

 - Rename the functions name in the driver to be consistent and generic
   with the different R-Car platform variants (Wolfram Sang)

 - Register the TI K3 J72xx bandgap sensor as a hwmon sensor too
   (Michael Walle)

 - Add and document the thermal sensor unit reporting the junction
   temperature of the RZ/G3S SoC (Claudiu Beznea)

 - Support the GRF in the Rockchip driver (Sebastian Reichel)

 - Add a temperature IIO sensor channel in the generic thermal ADC
   driver (Svyatoslav Ryhel)

 - Document the temperature sensor on the QCOM's Glymur platform (Manaf
   Meethalavalappu)

 - Add and document the thermal sensor unit reporting the junction
   temperature of the RZ/G3E SoC (John Madieu)"

* tag 'thermal-v6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (24 commits)
  dt-bindings: thermal: qcom-tsens: Document the Glymur temperature Sensor
  thermal/drivers/renesas/rzg3e: Add thermal driver for the Renesas RZ/G3E SoC
  dt-bindings: thermal: r9a09g047-tsu: Document the TSU unit
  thermal/drivers/thermal-generic-adc: Add temperature sensor channel
  dt-bindings: thermal: rockchip: Tighten grf requirements
  thermal/drivers/rockchip: Shut up GRF warning
  thermal/drivers/rockchip: Unify struct rockchip_tsadc_chip format
  thermal/drivers/renesas/rzg3s: Add thermal driver for the Renesas RZ/G3S SoC
  dt-bindings: thermal: r9a08g045-tsu: Document the TSU unit
  thermal/drivers/k3_j72xx_bandgap: Register sensors with hwmon
  thermal/drivers/rcar_gen3: Fix mapping SoCs to generic Gen4 entry
  thermal/drivers/tegra: Add Tegra114 specific SOCTHERM driver
  dt-bindings: thermal: add Tegra114 soctherm header
  thermal/drivers/tegra/soctherm-fuse: Prepare calibration for Tegra114 support
  dt-bindings: thermal: Document Tegra114 SOCTHERM Thermal Management System
  thermal/drivers/rcar_gen3: Document Gen4 support in Kconfig entry
  thermal/drivers/rcar_gen3: Fix comment typo
  drivers/thermal/qcom/lmh: Fix incorrect error message
  thermal/drivers/qcom/lmh: Add missing IRQ includes
  thermal/drivers/qcom: Make LMH select QCOM_SCM
  ...
parents b1793cd1 79428e60

Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ description: The SOCTHERM IP block contains thermal sensors, support for 
properties:

  compatible:

    enum:

      - nvidia,tegra114-soctherm

      - nvidia,tegra124-soctherm

      - nvidia,tegra132-soctherm

      - nvidia,tegra210-soctherm
@@ -206,6 +207,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - nvidia,tegra114-soctherm

              - nvidia,tegra124-soctherm

              - nvidia,tegra210-soctherm

              - nvidia,tegra210b01-soctherm

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

+2 −0
Original line number Diff line number Diff line
@@ -49,11 +49,13 @@ properties: 
      - description: v2 of TSENS

        items:

          - enum:

              - qcom,glymur-tsens

              - qcom,milos-tsens

              - qcom,msm8953-tsens

              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,qcm2290-tsens

              - qcom,qcs615-tsens

              - qcom,sa8255p-tsens

              - qcom,sa8775p-tsens

              - qcom,sar2130p-tsens

Documentation/devicetree/bindings/thermal/renesas,r9a08g045-tsu.yaml

0 → 100644
+93 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/renesas,r9a08g045-tsu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas RZ/G3S Thermal Sensor Unit



description:

  The thermal sensor unit (TSU) measures the temperature(Tj) inside

  the LSI.



maintainers:

  - Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>



$ref: thermal-sensor.yaml#



properties:

  compatible:

    const: renesas,r9a08g045-tsu



  reg:

    maxItems: 1



  clocks:

    items:

      - description: TSU module clock



  power-domains:

    maxItems: 1



  resets:

    items:

      - description: TSU module reset



  io-channels:

    items:

      - description: ADC channel which reports the TSU temperature



  io-channel-names:

    items:

      - const: tsu



  "#thermal-sensor-cells":

    const: 0



required:

  - compatible

  - reg

  - clocks

  - power-domains

  - resets

  - io-channels

  - io-channel-names

  - '#thermal-sensor-cells'



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/r9a08g045-cpg.h>



    tsu: thermal@10059000 {

        compatible = "renesas,r9a08g045-tsu";

        reg = <0x10059000 0x1000>;

        clocks = <&cpg CPG_MOD R9A08G045_TSU_PCLK>;

        resets = <&cpg R9A08G045_TSU_PRESETN>;

        power-domains = <&cpg>;

        #thermal-sensor-cells = <0>;

        io-channels = <&adc 8>;

        io-channel-names = "tsu";

    };



    thermal-zones {

        cpu-thermal {

            polling-delay-passive = <250>;

            polling-delay = <1000>;

            thermal-sensors = <&tsu>;



            trips {

                sensor_crit: sensor-crit {

                    temperature = <125000>;

                    hysteresis = <1000>;

                    type = "critical";

                };

                target: trip-point {

                    temperature = <100000>;

                    hysteresis = <1000>;

                    type = "passive";

                };

            };

        };

    };

Documentation/devicetree/bindings/thermal/renesas,r9a09g047-tsu.yaml

0 → 100644
+87 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/renesas,r9a09g047-tsu.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas RZ/G3E Temperature Sensor Unit (TSU)



maintainers:

  - John Madieu <john.madieu.xa@bp.renesas.com>



description:

  The Temperature Sensor Unit (TSU) is an integrated thermal sensor that

  monitors the chip temperature on the Renesas RZ/G3E SoC. The TSU provides

  real-time temperature measurements for thermal management.



properties:

  compatible:

    const: renesas,r9a09g047-tsu



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  power-domains:

    maxItems: 1



  interrupts:

    items:

      - description: Conversion complete interrupt signal (pulse)

      - description: Comparison result interrupt signal (level)



  interrupt-names:

    items:

      - const: adi

      - const: adcmpi



  "#thermal-sensor-cells":

    const: 0



  renesas,tsu-trim:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      - items:

          - description: phandle to system controller

          - description: offset of trim registers

    description:

      Phandle and offset to the system controller containing the TSU

      calibration trim values. The offset points to the first trim register

      (OTPTSU1TRMVAL0), with the second trim register (OTPTSU1TRMVAL1) located

      at offset + 4.



required:

  - compatible

  - reg

  - clocks

  - resets

  - power-domains

  - interrupts

  - interrupt-names

  - "#thermal-sensor-cells"

  - renesas,tsu-trim



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/renesas,r9a09g047-cpg.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>



    thermal-sensor@14002000 {

        compatible = "renesas,r9a09g047-tsu";

        reg = <0x14002000 0x1000>;

        clocks = <&cpg CPG_MOD 0x10a>;

        resets = <&cpg 0xf8>;

        power-domains = <&cpg>;

        interrupts = <GIC_SPI 250 IRQ_TYPE_EDGE_RISING>,

                     <GIC_SPI 251 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "adi", "adcmpi";

        #thermal-sensor-cells = <0>;

        renesas,tsu-trim = <&sys 0x330>;

    };

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

+15 −0
Original line number Diff line number Diff line
@@ -119,6 +119,21 @@ required: 
  - resets



allOf:

  - if:

      properties:

        compatible:

          contains:

            enum:

              - rockchip,px30-tsadc

              - rockchip,rk3366-tsadc

              - rockchip,rk3399-tsadc

              - rockchip,rk3568-tsadc

    then:

      required:

        - rockchip,grf

    else:

      properties:

        rockchip,grf: false

  - if:

      not:

        properties: