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

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

Pull thermal control changes for 6.19-rc1 from Daniel Lezcano:

"- Document the RZ/V2H TSU DT bindings (Ovidiu Panait)

 - Document the Kaanapali Temperature Sensor (Manaf Meethalavalappu
   Pallikunhi)

 - Document R-Car Gen4 and RZ/G2 support in driver comment (Marek Vasut)

 - Convert to DEFINE_SIMPLE_DEV_PM_OPS in the R-Car [Gen3] (Geert
   Uytterhoeven)

 - Fix format string bug in thermal-engine (Malaya Kumar Rout)

 - Make ipq5018 tsens standalone compatible (George Moussalem)

 - Add the QCS8300 compatible for the QCom Tsens (Gaurav Kohli)

 - Add the support for the NXP i.MX91 thermal module, including the DT
   bindings (Pengfei Li)

* tag 'thermal-v6.19-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/imx91: Add support for i.MX91 thermal monitoring unit
  dt-bindings: thermal: fsl,imx91-tmu: add bindings for NXP i.MX91 thermal module
  dt-bindings: thermal: tsens: Add QCS8300 compatible
  dt-bindings: thermal: qcom-tsens: make ipq5018 tsens standalone compatible
  tools/thermal/thermal-engine: Fix format string bug in thermal-engine
  thermal/drivers/rcar_gen3: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  thermal/drivers/rcar: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
  thermal/drivers/rcar_gen3: Document R-Car Gen4 and RZ/G2 support in driver comment
  dt-bindings: thermal: qcom-tsens: document the Kaanapali Temperature Sensor
  dt-bindings: thermal: r9a09g047-tsu: Document RZ/V2H TSU
parents 8538e7ee c411d8bf

Documentation/devicetree/bindings/thermal/fsl,imx91-tmu.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/fsl,imx91-tmu.yaml#

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



title: NXP i.MX91 Thermal



maintainers:

  - Pengfei Li <pengfei.li_1@nxp.com>



description:

  i.MX91 features a new temperature sensor. It includes programmable

  temperature threshold comparators for both normal and privileged

  accesses and allows a programmable measurement frequency for the

  Periodic One-Shot Measurement mode. Additionally, it provides

  status registers for indicating the end of measurement and threshold

  violation events.



properties:

  compatible:

    items:

      - const: fsl,imx91-tmu



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  interrupts:

    items:

      - description: Comparator 1 irq

      - description: Comparator 2 irq

      - description: Data ready irq



  interrupt-names:

    items:

      - const: thr1

      - const: thr2

      - const: ready



  nvmem-cells:

    items:

      - description: Phandle to the trim control 1 provided by ocotp

      - description: Phandle to the trim control 2 provided by ocotp



  nvmem-cell-names:

    items:

      - const: trim1

      - const: trim2



  "#thermal-sensor-cells":

    const: 0



required:

  - compatible

  - reg

  - clocks

  - interrupts

  - interrupt-names



allOf:

  - $ref: thermal-sensor.yaml



unevaluatedProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/imx93-clock.h>



    thermal-sensor@44482000 {

        compatible = "fsl,imx91-tmu";

        reg = <0x44482000 0x1000>;

        #thermal-sensor-cells = <0>;

        clocks = <&clk IMX93_CLK_TMC_GATE>;

        interrupt-parent = <&gic>;

        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

        interrupt-names = "thr1", "thr2", "ready";

        nvmem-cells = <&tmu_trim1>, <&tmu_trim2>;

        nvmem-cell-names = "trim1", "trim2";

    };



...

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

+8 −1
Original line number Diff line number Diff line
@@ -36,10 +36,15 @@ properties: 
              - qcom,msm8974-tsens

          - const: qcom,tsens-v0_1



      - description:

          v1 of TSENS without RPM which requires to be explicitly reset

          and enabled in the driver.

        enum:

          - qcom,ipq5018-tsens



      - description: v1 of TSENS

        items:

          - enum:

              - qcom,ipq5018-tsens

              - qcom,msm8937-tsens

              - qcom,msm8956-tsens

              - qcom,msm8976-tsens
@@ -50,11 +55,13 @@ properties: 
        items:

          - enum:

              - qcom,glymur-tsens

              - qcom,kaanapali-tsens

              - qcom,milos-tsens

              - qcom,msm8953-tsens

              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,qcm2290-tsens

	      - qcom,qcs8300-tsens

              - qcom,qcs615-tsens

              - qcom,sa8255p-tsens

              - qcom,sa8775p-tsens

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

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ description: 


properties:

  compatible:

    const: renesas,r9a09g047-tsu

    oneOf:

      - const: renesas,r9a09g047-tsu # RZ/G3E

      - items:

          - const: renesas,r9a09g057-tsu # RZ/V2H

          - const: renesas,r9a09g047-tsu # RZ/G3E



  reg:

    maxItems: 1

drivers/thermal/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -296,6 +296,16 @@ config IMX8MM_THERMAL 
	  cpufreq is used as the cooling device to throttle CPUs when the passive

	  trip is crossed.



config IMX91_THERMAL

	tristate "Temperature sensor driver for NXP i.MX91 SoC"

	depends on ARCH_MXC || COMPILE_TEST

	depends on OF

	help

	  Include one sensor and six comparators. Each of them compares the

	  temperature value (from the sensor) against the programmable

	  threshold values. The direction of the comparison is configurable

	  (greater / lesser than).



config K3_THERMAL

	tristate "Texas Instruments K3 thermal support"

	depends on ARCH_K3 || COMPILE_TEST

drivers/thermal/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o 
obj-$(CONFIG_IMX_THERMAL)	+= imx_thermal.o

obj-$(CONFIG_IMX_SC_THERMAL)	+= imx_sc_thermal.o

obj-$(CONFIG_IMX8MM_THERMAL)	+= imx8mm_thermal.o

obj-$(CONFIG_IMX91_THERMAL)	+= imx91_thermal.o

obj-$(CONFIG_MAX77620_THERMAL)	+= max77620_thermal.o

obj-$(CONFIG_QORIQ_THERMAL)	+= qoriq_thermal.o

obj-$(CONFIG_DA9062_THERMAL)	+= da9062-thermal.o