Commit 04929483 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control updates from Rafael Wysocki:
 "These add support for a new feature, Platform Temperature Control
  (PTC), to the Intel int340x thermal driver, add support for the Airoha
  EN7581 thermal sensor and the IPQ5018 platform, fix up the ACPI
  thermal zones handling, fix other assorted issues and clean up code

  Specifics:

   - Add Platform Temperature Control (PTC) support to the Intel int340x
     thermal driver (Srinivas Pandruvada)

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

   - Clean up printk() format by using %pC instead of %pCn in the
     bcm2835 thermal driver (Luca Ceresoli)

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

   - Fix missing debugfs entry removal on failure by using the devm_
     variant in the LVTS thermal 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 to the QCom Tsens thermal driver (Sricharan Ramabadhran,
     George Moussalem)

   - Fix comments typos in the Airoha driver (Christian Marangi, Colin
     Ian King)

   - Address a sparse warning by making a local variable static in the
     QCom thermal driver (George Moussalem)

   - Fix the usage of the _SCP control method in the driver for ACPI
     thermal zones (Armin Wolf)"

* tag 'thermal-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: qcom: ipq5018: make ops_ipq5018 struct static
  thermal/drivers/airoha: Fix spelling mistake "calibrarion" -> "calibration"
  ACPI: thermal: Execute _SCP before reading trip points
  ACPI: OSI: Stop advertising support for "3.0 _SCP Extensions"
  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
  thermal: int340x: processor_thermal: Platform temperature control documentation
  thermal: intel: int340x: Enable platform temperature control
  thermal: intel: int340x: Add platform temperature control interface
parents 35a8b02e 01daf71a

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/driver-api/thermal/intel_dptf.rst

+21 −0
Original line number Diff line number Diff line
@@ -191,6 +191,27 @@ ABI. 
	User space can specify any one of the available workload type using

	this interface.



:file:`/sys/bus/pci/devices/0000\:00\:04.0/ptc_0_control`

:file:`/sys/bus/pci/devices/0000\:00\:04.0/ptc_1_control`

:file:`/sys/bus/pci/devices/0000\:00\:04.0/ptc_2_control`



All these controls needs admin privilege to update.



``enable`` (RW)

	1 for enable, 0 for disable. Shows the current enable status of

	platform temperature control feature. User space can enable/disable

	hardware controls.



``temperature_target`` (RW)

	Update a new temperature target in milli degree celsius for hardware to

	use for the temperature control.



Given that this is platform temperature control, it is expected that a

single user-level manager owns and manages the controls. If multiple

user-level software applications attempt to write different targets, it

can lead to unexpected behavior.





DPTF Processor thermal RFIM interface

--------------------------------------------

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（传统时钟框架）。



通过引用传递。