Commit 5a77b6a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull thermal updates from Daniel Lezcano:

 - Fix Kconfig typo "acces" -> "access" (Colin Ian King)

 - Use dev_error_probe() to simplify the error handling on imx and imx8
   platforms (Anson Huang)

 - Use dedicated kobj_to_dev() instead of container_of() in the sysfs
   core code (Tian Tao)

 - Fix coding style by adding braces to a one line conditional statement
   on rcar (Geert Uytterhoeven)

 - Add DT binding documentation for the r8a774e1 platform and update the
   Kconfig description supporting RZ/G2 SoCs (Lad Prabhakar)

 - Simplify the return expression of stm_thermal_prepare on the stm32
   platform (Qinglang Miao)

 - Fix the unit in the function documentation for the idle injection
   cooling device (Zhuguang Qing)

 - Remove an unecessary mutex_init() in the core code (Qinglang Miao)

 - Add support for keep alive events in the core code and the specific
   int340x (Srinivas Pandruvada)

 - Remove unused thermal zone variable in devfreq and cpufreq cooling
   devices (Zhuguang Qing)

 - Add the A100's THS controller support (Yangtao Li)

 - Add power management on the omap3's bandgap sensor (Adam Ford)

 - Fix a missing nlmsg_free in the netlink core error path (Jing
   Xiangfeng)

* tag 'thermal-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal: core: Adding missing nlmsg_free() in thermal_genl_sampling_temp()
  thermal: ti-soc-thermal: Enable addition power management
  thermal: sun8i: Add A100's THS controller support
  thermal: sun8i: add TEMP_CALIB_MASK for calibration data in sun50i_h6_ths_calibrate
  dt-bindings: thermal: sun8i: Add binding for A100's THS controller
  thermal: cooling: Remove unused variable *tz
  thermal: int340x: Add keep alive response method
  thermal: core: Add new event for sending keep alive notifications
  thermal: int340x: Provide notification for OEM variable change
  thermal: core: remove unnecessary mutex_init()
  thermal/idle_inject: Fix comment of idle_duration_us and name of latency_ns
  thermal: Kconfig: Update description for RCAR_GEN3_THERMAL config
  thermal: stm32: simplify the return expression of stm_thermal_prepare()
  dt-bindings: thermal: rcar-gen3-thermal: Add r8a774e1 support
  thermal: rcar_thermal: Add missing braces to conditional statement
  thermal: Use kobj_to_dev() instead of container_of()
  thermal: imx8mm: Use dev_err_probe() to simplify error handling
  thermal: imx: Use dev_err_probe() to simplify error handling
  drivers: thermal: Kconfig: fix spelling mistake "acces" -> "access"
parents 071a0578 48b45859

Documentation/devicetree/bindings/thermal/allwinner,sun8i-a83t-ths.yaml

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
      - allwinner,sun8i-h3-ths

      - allwinner,sun8i-r40-ths

      - allwinner,sun50i-a64-ths

      - allwinner,sun50i-a100-ths

      - allwinner,sun50i-h5-ths

      - allwinner,sun50i-h6-ths
@@ -61,7 +62,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: allwinner,sun50i-h6-ths

            enum:

              - allwinner,sun50i-a100-ths

              - allwinner,sun50i-h6-ths



    then:

      properties:
@@ -103,6 +106,7 @@ allOf: 
              - const: allwinner,sun8i-h3-ths

              - const: allwinner,sun8i-r40-ths

              - const: allwinner,sun50i-a64-ths

              - const: allwinner,sun50i-a100-ths

              - const: allwinner,sun50i-h5-ths

              - const: allwinner,sun50i-h6-ths

Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
    enum:

      - renesas,r8a774a1-thermal # RZ/G2M

      - renesas,r8a774b1-thermal # RZ/G2N

      - renesas,r8a774e1-thermal # RZ/G2H

      - renesas,r8a7795-thermal  # R-Car H3

      - renesas,r8a7796-thermal  # R-Car M3-W

      - renesas,r8a77961-thermal # R-Car M3-W+

drivers/thermal/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -346,13 +346,13 @@ config RCAR_THERMAL 
	  thermal framework.



config RCAR_GEN3_THERMAL

	tristate "Renesas R-Car Gen3 thermal driver"

	tristate "Renesas R-Car Gen3 and RZ/G2 thermal driver"

	depends on ARCH_RENESAS || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF

	help

	  Enable this to plug the R-Car Gen3 thermal sensor driver into the Linux

	  thermal framework.

	  Enable this to plug the R-Car Gen3 or RZ/G2 thermal sensor driver into

	  the Linux thermal framework.



config KIRKWOOD_THERMAL

	tristate "Temperature sensor on Marvell Kirkwood SoCs"

drivers/thermal/cpufreq_cooling.c

+1 −7
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev, 
/**

 * cpufreq_get_requested_power() - get the current power

 * @cdev:	&thermal_cooling_device pointer

 * @tz:		a valid thermal zone device pointer

 * @power:	pointer in which to store the resulting power

 *

 * Calculate the current power consumption of the cpus in milliwatts
@@ -203,7 +202,6 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev, 
 * Return: 0 on success, -E* if getting the static power failed.

 */

static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev,

				       struct thermal_zone_device *tz,

				       u32 *power)

{

	unsigned long freq;
@@ -253,7 +251,6 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, 
/**

 * cpufreq_state2power() - convert a cpu cdev state to power consumed

 * @cdev:	&thermal_cooling_device pointer

 * @tz:		a valid thermal zone device pointer

 * @state:	cooling device state to be converted

 * @power:	pointer in which to store the resulting power

 *
@@ -266,7 +263,6 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, 
 * when calculating the static power.

 */

static int cpufreq_state2power(struct thermal_cooling_device *cdev,

			       struct thermal_zone_device *tz,

			       unsigned long state, u32 *power)

{

	unsigned int freq, num_cpus, idx;
@@ -288,7 +284,6 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev, 
/**

 * cpufreq_power2state() - convert power to a cooling device state

 * @cdev:	&thermal_cooling_device pointer

 * @tz:		a valid thermal zone device pointer

 * @power:	power in milliwatts to be converted

 * @state:	pointer in which to store the resulting state

 *
@@ -306,8 +301,7 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev, 
 * device.

 */

static int cpufreq_power2state(struct thermal_cooling_device *cdev,

			       struct thermal_zone_device *tz, u32 power,

			       unsigned long *state)

			       u32 power, unsigned long *state)

{

	unsigned int target_freq;

	u32 last_load, normalised_power;

drivers/thermal/cpuidle_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static DEFINE_IDA(cpuidle_ida); 


/**

 * cpuidle_cooling_runtime - Running time computation

 * @idle_duration_us: the idle cooling device

 * @idle_duration_us: CPU idle time to inject in microseconds

 * @state: a percentile based number

 *

 * The running duration is computed from the idle injection duration

CRA Git | Maintained and supported by SUSTech CRA and CCSE