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

Merge tag 'thermal-v5.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

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

"- Convert the DT bindings to yaml format for the Exynos platform
   and fix the MAINTAINERS file regarding this driver (Krzysztof
   Kozlowski)

 - Register the thermal zones as HWmon sensors for the QCom's
   Tsens driver (Dmitry Baryshkov)

 - Add the sm8150 platform support to LMh (Thara Gopinath)

 - Add the msm8953 compatible documentation in the bindings (Luca
   Weiss)

 - Register the thermal zones as HWmon sensors for the TI thermal
   platforms (Romain Naour)

 - Check the command result from the IPC command to the
   BPMP in the Tegra driver (Mikko Perttunen)

 - Silent the error for normal configuration where the interrupt
   is optionnal on the Broadcom thermal driver (Florian Fainelli)

 - Remove a remaining dead code from the TI thermal driver (Yue
   Haibing)

 - Update the email in MAINTAINERS file for the Exynos thermal
   driver (Krzysztof Kozlowski)"

* tag 'thermal-v5.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  MAINTAINERS: thermal: samsung: update Krzysztof Kozlowski's email
  thermal/drivers/ti-soc-thermal: Remove unused function ti_thermal_get_temp()
  thermal/drivers/brcmstb_thermal: Interrupt is optional
  thermal: tegra-bpmp: Handle errors in BPMP response
  drivers/thermal/ti-soc-thermal: Add hwmon support
  dt-bindings: thermal: tsens: Add msm8953 compatible
  dt-bindings: thermal: Add sm8150 compatible string for LMh
  thermal/drivers/qcom/lmh: Add support for sm8150
  thermal/drivers/tsens: register thermal zones as hwmon sensors
  MAINTAINERS: thermal: samsung: Drop obsolete properties
  dt-bindings: thermal: samsung: Convert to dtschema
parents 5838a148 a7da8a09

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

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
* Exynos Thermal Management Unit (TMU)



** Required properties:



- compatible : One of the following:

	       "samsung,exynos3250-tmu"

	       "samsung,exynos4412-tmu"

	       "samsung,exynos4210-tmu"

	       "samsung,exynos5250-tmu"

	       "samsung,exynos5260-tmu"

	       "samsung,exynos5420-tmu" for TMU channel 0, 1 on Exynos5420

	       "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4

			Exynos5420 (Must pass triminfo base and triminfo clock)

               "samsung,exynos5433-tmu"

	       "samsung,exynos7-tmu"

- reg : Address range of the thermal registers. For soc's which has multiple

	instances of TMU and some registers are shared across all TMU's like

	interrupt related then 2 set of register has to supplied. First set

	belongs	to register set of TMU instance and second set belongs to

	registers shared with the TMU instance.



  NOTE: On Exynos5420, the TRIMINFO register is misplaced for TMU

	channels 2, 3 and 4

	Use "samsung,exynos5420-tmu-ext-triminfo" in cases, there is a misplaced

	register, also provide clock to access that base.



	TRIMINFO at 0x1006c000 contains data for TMU channel 3

	TRIMINFO at 0x100a0000 contains data for TMU channel 4

	TRIMINFO at 0x10068000 contains data for TMU channel 2



- interrupts : Should contain interrupt for thermal system

- clocks : The main clocks for TMU device

	-- 1. operational clock for TMU channel

	-- 2. optional clock to access the shared registers of TMU channel

	-- 3. optional special clock for functional operation

- clock-names : Thermal system clock name

	-- "tmu_apbif" operational clock for current TMU channel

	-- "tmu_triminfo_apbif" clock to access the shared triminfo register

		for current TMU channel

	-- "tmu_sclk" clock for functional operation of the current TMU

		channel



The Exynos TMU supports generating interrupts when reaching given

temperature thresholds. Number of supported thermal trip points depends

on the SoC (only first trip points defined in DT will be configured):

 - most of SoC: 4

 - samsung,exynos5433-tmu: 8

 - samsung,exynos7-tmu: 8



** Optional properties:



- vtmu-supply: This entry is optional and provides the regulator node supplying

		voltage to TMU. If needed this entry can be placed inside

		board/platform specific dts file.



Example 1):



	tmu@100c0000 {

		compatible = "samsung,exynos4412-tmu";

		interrupt-parent = <&combiner>;

		reg = <0x100C0000 0x100>;

		interrupts = <2 4>;

		clocks = <&clock 383>;

		clock-names = "tmu_apbif";

		vtmu-supply = <&tmu_regulator_node>;

		#thermal-sensor-cells = <0>;

	};



Example 2): (In case of Exynos5420 "with misplaced TRIMINFO register")

	tmu_cpu2: tmu@10068000 {

		compatible = "samsung,exynos5420-tmu-ext-triminfo";

		reg = <0x10068000 0x100>, <0x1006c000 0x4>;

		interrupts = <0 184 0>;

		clocks = <&clock 318>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#thermal-sensor-cells = <0>;

	};



	tmu_cpu3: tmu@1006c000 {

		compatible = "samsung,exynos5420-tmu-ext-triminfo";

		reg = <0x1006c000 0x100>, <0x100a0000 0x4>;

		interrupts = <0 185 0>;

		clocks = <&clock 318>, <&clock 319>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#thermal-sensor-cells = <0>;

	};



	tmu_gpu: tmu@100a0000 {

		compatible = "samsung,exynos5420-tmu-ext-triminfo";

		reg = <0x100a0000 0x100>, <0x10068000 0x4>;

		interrupts = <0 215 0>;

		clocks = <&clock 319>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#thermal-sensor-cells = <0>;

	};



Note: For multi-instance tmu each instance should have an alias correctly

numbered in "aliases" node.



Example:



aliases {

	tmuctrl0 = &tmuctrl_0;

	tmuctrl1 = &tmuctrl_1;

	tmuctrl2 = &tmuctrl_2;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
  compatible:

    enum:

      - qcom,sdm845-lmh

      - qcom,sm8150-lmh



  reg:

    items:

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 
      - description: v2 of TSENS

        items:

          - enum:

              - qcom,msm8953-tsens

              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,sc7180-tsens

Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml

0 → 100644
+184 −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/samsung,exynos-thermal.yaml#

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



title: Samsung Exynos SoC Thermal Management Unit (TMU)



maintainers:

  - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>



description: |

  For multi-instance tmu each instance should have an alias correctly numbered

  in "aliases" node.



properties:

  compatible:

    enum:

      - samsung,exynos3250-tmu

      - samsung,exynos4412-tmu

      - samsung,exynos4210-tmu

      - samsung,exynos5250-tmu

      - samsung,exynos5260-tmu

        # For TMU channel 0, 1 on Exynos5420:

      - samsung,exynos5420-tmu

        # For TMU channels 2, 3 and 4 of Exynos5420:

      - samsung,exynos5420-tmu-ext-triminfo

      - samsung,exynos5433-tmu

      - samsung,exynos7-tmu



  clocks:

    minItems: 1

    maxItems: 3



  clock-names:

    minItems: 1

    maxItems: 3



  interrupts:

    description: |

      The Exynos TMU supports generating interrupts when reaching given

      temperature thresholds. Number of supported thermal trip points depends

      on the SoC (only first trip points defined in DT will be configured)::

       - most of SoC: 4

       - samsung,exynos5433-tmu: 8

       - samsung,exynos7-tmu: 8

    maxItems: 1



  reg:

    items:

      - description: TMU instance registers.

      - description: |

          Shared TMU registers.



          Note:: On Exynos5420, the TRIMINFO register is misplaced for TMU

          channels 2, 3 and 4 Use "samsung,exynos5420-tmu-ext-triminfo" in

          cases, there is a misplaced register, also provide clock to access

          that base.

          TRIMINFO at 0x1006c000 contains data for TMU channel 3

          TRIMINFO at 0x100a0000 contains data for TMU channel 4

          TRIMINFO at 0x10068000 contains data for TMU channel 2

    minItems: 1



  '#thermal-sensor-cells': true



  vtmu-supply:

    description: The regulator node supplying voltage to TMU.



required:

  - compatible

  - clocks

  - clock-names

  - interrupts

  - reg



allOf:

  - $ref: /schemas/thermal/thermal-sensor.yaml

  - if:

      properties:

        compatible:

          contains:

            const: samsung,exynos5420-tmu-ext-triminfo

    then:

      properties:

        clocks:

          items:

            - description:

                Operational clock for TMU channel.

            - description:

                Optional clock to access the shared registers (e.g. TRIMINFO) of TMU

                channel.

        clock-names:

          items:

            - const: tmu_apbif

            - const: tmu_triminfo_apbif

        reg:

          minItems: 2

          maxItems: 2

  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos5433-tmu

              - samsung,exynos7-tmu

    then:

      properties:

        clocks:

          items:

            - description:

                Operational clock for TMU channel.

            - description:

                Optional special clock for functional operation of TMU channel.

        clock-names:

          items:

            - const: tmu_apbif

            - const: tmu_sclk

        reg:

          minItems: 1

          maxItems: 1



  - if:

      properties:

        compatible:

          contains:

            enum:

              - samsung,exynos3250-tmu

              - samsung,exynos4412-tmu

              - samsung,exynos4210-tmu

              - samsung,exynos5250-tmu

              - samsung,exynos5260-tmu

              - samsung,exynos5420-tmu

    then:

      properties:

        clocks:

          minItems: 1

          maxItems: 1

        reg:

          minItems: 1

          maxItems: 1



additionalProperties: false



examples:

  - |

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



    tmu@100c0000 {

        compatible = "samsung,exynos4412-tmu";

        reg = <0x100C0000 0x100>;

        interrupt-parent = <&combiner>;

        interrupts = <2 4>;

        #thermal-sensor-cells = <0>;

        clocks = <&clock CLK_TMU_APBIF>;

        clock-names = "tmu_apbif";

        vtmu-supply = <&ldo10_reg>;

    };



  - |

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



    tmu@10068000 {

        compatible = "samsung,exynos5420-tmu-ext-triminfo";

        reg = <0x10068000 0x100>, <0x1006c000 0x4>;

        interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;

        #thermal-sensor-cells = <0>;

        clocks = <&clock 318>, <&clock 318>; /* CLK_TMU */

        clock-names = "tmu_apbif", "tmu_triminfo_apbif";

        vtmu-supply = <&ldo7_reg>;

    };



  - |

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



    tmu@10060000 {

        compatible = "samsung,exynos5433-tmu";

        reg = <0x10060000 0x200>;

        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

        #thermal-sensor-cells = <0>;

        clocks = <&cmu_peris 3>, /* CLK_PCLK_TMU0_APBIF */

                 <&cmu_peris 35>; /* CLK_SCLK_TMU0 */

        clock-names = "tmu_apbif", "tmu_sclk";

        vtmu-supply = <&ldo3_reg>;

    };

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -17135,11 +17135,12 @@ S: Supported 
F:	drivers/net/ethernet/samsung/sxgbe/









SAMSUNG THERMAL DRIVER









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









M:	Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









L:	linux-pm@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Supported









T:	git https://github.com/lmajewski/linux-samsung-thermal.git









S:	Maintained









F:	Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml









F:	drivers/thermal/samsung/

















SAMSUNG USB2 PHY DRIVER