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

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

Pull thermal updates from Daniel Lezcano:

 - Add rk3568 sensor support (Finley Xiao)

 - Add missing MODULE_DEVICE_TABLE for the Spreadtrum sensor (Chunyan
   Zhang)

 - Export additionnal attributes for the int340x thermal processor
   (Srinivas Pandruvada)

 - Add SC7280 compatible for the tsens driver (Rajeshwari Ravindra
   Kamble)

 - Fix kernel documentation for thermal_zone_device_unregister() and use
   devm_platform_get_and_ioremap_resource() (Yang Yingliang)

 - Fix coefficient calculations for the rcar_gen3 sensor driver (Niklas
   Söderlund)

 - Fix shadowing variable rcar_gen3_ths_tj_1 (Geert Uytterhoeven)

 - Add missing of_node_put() for the iMX and Spreadtrum sensors
   (Krzysztof Kozlowski)

 - Add tegra3 thermal sensor DT bindings (Dmitry Osipenko)

 - Stop the thermal zone monitoring when unregistering it to prevent a
   temperature update without the 'get_temp' callback (Dmitry Osipenko)

 - Add rk3568 DT bindings, convert bindings to yaml schemas and add the
   corresponding compatible in the Rockchip sensor (Ezequiel Garcia)

 - Add the sc8180x compatible for the Qualcomm tsensor (Bjorn Andersson)

 - Use the find_first_zero_bit() function instead of custom code (Andy
   Shevchenko)

 - Fix the kernel doc for the device cooling device (Yang Li)

 - Reorg the processor thermal int340x to set the scene for the PCI mmio
   driver (Srinivas Pandruvada)

 - Add PCI MMIO driver for the int340x processor thermal driver
   (Srinivas Pandruvada)

 - Add hwmon sensors for the mediatek sensor (Frank Wunderlich)

 - Fix warning for return value reported by Smatch for the int340x
   thermal processor (Srinivas Pandruvada)

 - Fix wrong register access and decoding for the int340x thermal
   processor (Srinivas Pandruvada)

* tag 'thermal-v5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (23 commits)
  thermal/drivers/int340x/processor_thermal: Fix tcc setting
  thermal/drivers/int340x/processor_thermal: Fix warning for return value
  thermal/drivers/mediatek: Add sensors-support
  thermal/drivers/int340x/processor_thermal: Add PCI MMIO based thermal driver
  thermal/drivers/int340x/processor_thermal: Split enumeration and processing part
  thermal: devfreq_cooling: Fix kernel-doc
  thermal/drivers/intel/intel_soc_dts_iosf: Switch to use find_first_zero_bit()
  dt-bindings: thermal: tsens: Add sc8180x compatible
  dt-bindings: rockchip-thermal: Support the RK3568 SoC compatible
  dt-bindings: thermal: convert rockchip-thermal to json-schema
  thermal/core/thermal_of: Stop zone device before unregistering it
  dt-bindings: thermal: Add binding for Tegra30 thermal sensor
  thermal/drivers/sprd: Add missing of_node_put for loop iteration
  thermal/drivers/imx_sc: Add missing of_node_put for loop iteration
  thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1
  thermal/drivers/rcar_gen3_thermal: Fix coefficient calculations
  thermal/drivers/st: Use devm_platform_get_and_ioremap_resource()
  thermal/core: Correct function name thermal_zone_device_unregister()
  dt-bindings: thermal: tsens: Add compatible string to TSENS binding for SC7280
  thermal/drivers/int340x: processor_thermal: Export additional attributes
  ...
parents 81361b83 fe6a6de6

Documentation/devicetree/bindings/thermal/nvidia,tegra30-tsensor.yaml

0 → 100644
+73 −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/nvidia,tegra30-tsensor.yaml#

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



title: NVIDIA Tegra30 Thermal Sensor



maintainers:

  - Dmitry Osipenko <digetx@gmail.com>

  - Jon Hunter <jonathanh@nvidia.com>

  - Thierry Reding <thierry.reding@gmail.com>



description: |

  TSENSOR provides thermal and voltage sensors which monitor temperature

  and voltage of the chip. Sensors are placed across the die to gauge the

  temperature of the whole chip. The TSENSOR module:



    Generates an interrupt to SW to lower temperature via DVFS on reaching

    a certain thermal/voltage threshold.



    Generates a signal to the CAR to reduce CPU frequency by half on reaching

    a certain thermal/voltage threshold.



    Generates a signal to the PMC when the temperature reaches dangerously high

    levels to reset the chip and sets a flag in the PMC.



  TSENSOR has two channels which monitor two different spots of the SoC.



properties:

  compatible:

    const: nvidia,tegra30-tsensor



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  interrupts:

    maxItems: 1



  "#thermal-sensor-cells":

    const: 1



  assigned-clock-parents: true

  assigned-clock-rates: true

  assigned-clocks: true



required:

  - compatible

  - reg

  - clocks

  - resets

  - interrupts

  - "#thermal-sensor-cells"



additionalProperties: false



examples:

  - |

    thermal-sensor@70014000 {

      compatible = "nvidia,tegra30-tsensor";

      reg = <0x70014000 0x500>;

      interrupts = <0 102 4>;

      clocks = <&clk 100>;

      resets = <&rst 100>;



      #thermal-sensor-cells = <1>;

    };

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

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ properties: 
              - qcom,msm8996-tsens

              - qcom,msm8998-tsens

              - qcom,sc7180-tsens

              - qcom,sc7280-tsens

              - qcom,sc8180x-tsens

              - qcom,sdm845-tsens

              - qcom,sm8150-tsens

              - qcom,sm8250-tsens

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

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
* Temperature Sensor ADC (TSADC) on rockchip SoCs



Required properties:

- compatible : should be "rockchip,<name>-tsadc"

   "rockchip,px30-tsadc":   found on PX30 SoCs

   "rockchip,rv1108-tsadc": found on RV1108 SoCs

   "rockchip,rk3228-tsadc": found on RK3228 SoCs

   "rockchip,rk3288-tsadc": found on RK3288 SoCs

   "rockchip,rk3328-tsadc": found on RK3328 SoCs

   "rockchip,rk3368-tsadc": found on RK3368 SoCs

   "rockchip,rk3399-tsadc": found on RK3399 SoCs

- reg : physical base address of the controller and length of memory mapped

	region.

- interrupts : The interrupt number to the cpu. The interrupt specifier format

	       depends on the interrupt controller.

- clocks : Must contain an entry for each entry in clock-names.

- clock-names : Shall be "tsadc" for the converter-clock, and "apb_pclk" for

		the peripheral clock.

- resets : Must contain an entry for each entry in reset-names.

	   See ../reset/reset.txt for details.

- reset-names : Must include the name "tsadc-apb".

- pinctrl-names : The pin control state names;

- pinctrl-0 : The "init" pinctrl state, it will be set before device probe.

- pinctrl-1 : The "default" pinctrl state, it will be set after reset the

	      TSADC controller.

- pinctrl-2 : The "sleep" pinctrl state, it will be in for suspend.

- #thermal-sensor-cells : Should be 1. See Documentation/devicetree/bindings/thermal/thermal-sensor.yaml for a description.



Optional properties:

- rockchip,hw-tshut-temp : The hardware-controlled shutdown temperature value.

- rockchip,hw-tshut-mode : The hardware-controlled shutdown mode 0:CRU 1:GPIO.

- rockchip,hw-tshut-polarity : The hardware-controlled active polarity 0:LOW

			       1:HIGH.

- rockchip,grf : The phandle of the syscon node for the general register file.



Exiample:

tsadc: tsadc@ff280000 {

	compatible = "rockchip,rk3288-tsadc";

	reg = <0xff280000 0x100>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;

	clock-names = "tsadc", "apb_pclk";

	resets = <&cru SRST_TSADC>;

	reset-names = "tsadc-apb";

	pinctrl-names = "init", "default", "sleep";

	pinctrl-0 = <&otp_gpio>;

	pinctrl-1 = <&otp_out>;

	pinctrl-2 = <&otp_gpio>;

	#thermal-sensor-cells = <1>;

	rockchip,hw-tshut-temp = <95000>;

	rockchip,hw-tshut-mode = <0>;

	rockchip,hw-tshut-polarity = <0>;

};



Example: referring to thermal sensors:

thermal-zones {

	cpu_thermal: cpu_thermal {

		polling-delay-passive = <1000>; /* milliseconds */

		polling-delay = <5000>; /* milliseconds */



		/* sensor	ID */

		thermal-sensors = <&tsadc	1>;



		trips {

			cpu_alert0: cpu_alert {

				temperature = <70000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			cpu_crit: cpu_crit {

				temperature = <90000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";

			};

		};



		cooling-maps {

			map0 {

				trip = <&cpu_alert0>;

				cooling-device =

				    <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

			};

		};

	};

};

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

0 → 100644
+96 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/thermal/rockchip-thermal.yaml#

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



title: Temperature Sensor ADC (TSADC) on Rockchip SoCs



maintainers:

  - Heiko Stuebner <heiko@sntech.de>



properties:

  compatible:

    enum:

      - rockchip,px30-tsadc # PX30 SoCs

      - rockchip,rv1108-tsadc # RV1108 SoCs

      - rockchip,rk3228-tsadc # RK3228 SoCs

      - rockchip,rk3288-tsadc # RK3288 SoCs

      - rockchip,rk3328-tsadc # RK3328 SoCs

      - rockchip,rk3368-tsadc # RK3368 SoCs

      - rockchip,rk3399-tsadc # RK3399 SoCs

      - rockchip,rk3568-tsadc # RK3568 SoCs



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    minItems: 2

    maxItems: 2



  clock-names:

    items:

      - const: tsadc

      - const: apb_pclk



  resets:

    maxItems: 1



  reset-names:

    items:

      - const: tsadc-apb



  "#thermal-sensor-cells":

    const: 1



  rockchip,grf:

    description: The phandle of the syscon node for the general register file.

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



  rockchip,hw-tshut-temp:

    description: The hardware-controlled shutdown temperature value.

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



  rockchip,hw-tshut-mode:

    description: The hardware-controlled shutdown mode 0:CRU 1:GPIO.

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

    enum: [0, 1]



  rockchip,hw-tshut-polarity:

    description: The hardware-controlled active polarity 0:LOW 1:HIGH.

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

    enum: [0, 1]



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names

  - resets

  - reset-names

  - "#thermal-sensor-cells"



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/rk3288-cru.h>



    tsadc: tsadc@ff280000 {

        compatible = "rockchip,rk3288-tsadc";

        reg = <0xff280000 0x100>;

        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>;

        clock-names = "tsadc", "apb_pclk";

        resets = <&cru SRST_TSADC>;

        reset-names = "tsadc-apb";

        #thermal-sensor-cells = <1>;

        rockchip,hw-tshut-temp = <95000>;

        rockchip,hw-tshut-mode = <0>;

        rockchip,hw-tshut-polarity = <0>;

    };

drivers/thermal/devfreq_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ struct thermal_cooling_device *devfreq_cooling_register(struct devfreq *df) 
EXPORT_SYMBOL_GPL(devfreq_cooling_register);



/**

 * devfreq_cooling_em_register_power() - Register devfreq cooling device with

 * devfreq_cooling_em_register() - Register devfreq cooling device with

 *		power information and automatically register Energy Model (EM)

 * @df:		Pointer to devfreq device.

 * @dfc_power:	Pointer to devfreq_cooling_power.