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

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

Merge updates of multiple thermal drivers for 6.16 from Daniel Lezcano:

"- Make the Hisilicon driver to compile by default when ARCH_HISI is
   set (Krzysztof Kozlowski)

 - Cleanup printk format with use of %pC instead of %pCn in the bcm2835
   driver (Luca Ceresoli)

 - Fix variable naming coding style in the AmLogic driver (Enrique
   Isidoro Vazquez Ramos)

 - Fix missing debugfs entry removal on failure by using the devm_
   variant in the LVTS driver (AngeloGioacchino Del Regno)

 - Remove the unused lvts_debugfs_exit() function as the devm variant
   introduced before takes care of removing the debugfs entry in the
   LVTS driver (Arnd Bergmann)

 - Add the Airoha EN7581 thermal sensor support along with its DT
   bindings (Christian Marangi)

 - Add ipq5018 compatible string DT binding, cleanup and add its suppot
   in the QCom Tsens driver driver (Sricharan Ramabadhran and George
   Moussalem)

 - Fix comments typos in the Airoha driver (Christian Marangi)"

* tag 'thermal-v6.16-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/airoha: Fix spelling mistake
  thermal/drivers/qcom/tsens: Add support for IPQ5018 tsens
  thermal/drivers/qcom/tsens: Add support for tsens v1 without RPM
  thermal/drivers/qcom/tsens: Update conditions to strictly evaluate for IP v2+
  dt-bindings: thermal: qcom-tsens: Add ipq5018 compatible
  thermal/drivers: Add support for Airoha EN7581 thermal sensor
  dt-bindings: thermal: Add support for Airoha EN7581 thermal sensor
  thermal/drivers/mediatek/lvts: Remove unused lvts_debugfs_exit
  thermal/drivers/mediatek/lvts: Fix debugfs unregister on failure
  thermal/drivers/amlogic: Rename Uptat to uptat to follow kernel coding style
  vsprintf: remove redundant and unused %pCn format specifier
  thermal/drivers/bcm2835: Use %pC instead of %pCn
  thermal/drivers/hisi: Do not enable by default during compile testing
parents 2a8aadb1 e23cba0a

Documentation/core-api/printk-formats.rst

+1 −2
Original line number Diff line number Diff line
@@ -571,9 +571,8 @@ struct clk 
::



	%pC	pll1

	%pCn	pll1



For printing struct clk structures. %pC and %pCn print the name of the clock

For printing struct clk structures. %pC prints the name of the clock

(Common Clock Framework) or a unique 32-bit ID (legacy clock framework).



Passed by reference.

Documentation/devicetree/bindings/thermal/airoha,en7581-thermal.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/airoha,en7581-thermal.yaml#

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



title: Airoha EN7581 Thermal Sensor and Monitor



maintainers:

  - Christian Marangi <ansuelsmth@gmail.com>



properties:

  compatible:

    const: airoha,en7581-thermal



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  airoha,chip-scu:

    description: phandle to the chip SCU syscon

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



  '#thermal-sensor-cells':

    const: 0



required:

  - compatible

  - reg

  - interrupts

  - airoha,chip-scu



additionalProperties: false



examples:

  - |

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



    thermal-sensor@1efbd800 {

        compatible = "airoha,en7581-thermal";

        reg = <0x1efbd000 0xd5c>;

        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;

        airoha,chip-scu = <&chip_scu>;



        #thermal-sensor-cells = <0>;

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ properties: 
      - description: v1 of TSENS

        items:

          - enum:

              - qcom,ipq5018-tsens

              - qcom,msm8937-tsens

              - qcom,msm8956-tsens

              - qcom,msm8976-tsens
@@ -251,6 +252,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,ipq5018-tsens

              - qcom,ipq8064-tsens

              - qcom,msm8960-tsens

              - qcom,tsens-v0_1

Documentation/translations/zh_CN/core-api/printk-formats.rst

+1 −2
Original line number Diff line number Diff line
@@ -523,9 +523,8 @@ clk结构体 
::



	%pC	pll1

	%pCn	pll1



用于打印clk结构。%pC 和 %pCn 打印时钟的名称（通用时钟框架）或唯一的32位

用于打印clk结构。%pC 打印时钟的名称（通用时钟框架）或唯一的32位

ID（传统时钟框架）。



通过引用传递。

drivers/thermal/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ config HISI_THERMAL 
	depends on ARCH_HISI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF

	default y

	default ARCH_HISI

	help

	  Enable this to plug hisilicon's thermal sensor driver into the Linux

	  thermal framework. cpufreq is used as the cooling device to throttle
@@ -327,6 +327,15 @@ config QORIQ_THERMAL 
	  cpufreq is used as the cooling device to throttle CPUs when the

	  passive trip is crossed.



config AIROHA_THERMAL

	tristate "Airoha thermal sensor driver"

	depends on ARCH_AIROHA || COMPILE_TEST

	depends on MFD_SYSCON

	depends on OF

	help

	  Enable this to plug the Airoha thermal sensor driver into the Linux

	  thermal framework.



config SPEAR_THERMAL

	tristate "SPEAr thermal sensor driver"

	depends on PLAT_SPEAR || COMPILE_TEST