Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal management updates from Zhang Rui:

 - Add Amit Kucheria as thermal subsystem Reviewer (Amit Kucheria)

 - Fix a use after free bug when unregistering thermal zone devices (Ido
   Schimmel)

 - Fix thermal core framework to use put_device() when device_register()
   fails (Yue Hu)

 - Enable intel_pch_thermal and MMIO RAPL support for Intel Icelake
   platform (Srinivas Pandruvada)

 - Add clock operations in qorip thermal driver, for some platforms with
   clock control like i.MX8MQ (Anson Huang)

 - A couple of trivial fixes and cleanups for thermal core and different
   soc thermal drivers (Amit Kucheria, Christophe JAILLET, Chuhong Yuan,
   Fuqian Huang, Kelsey Skunberg, Nathan Huckleberry, Rishi Gupta,
   Srinivas Kandagatla)

* 'for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  MAINTAINERS: Add Amit Kucheria as reviewer for thermal
  thermal: Add some error messages
  thermal: Fix use-after-free when unregistering thermal zone device
  thermal/drivers/core: Use put_device() if device_register() fails
  thermal_hwmon: Sanitize thermal_zone type
  thermal: intel: Use dev_get_drvdata
  thermal: intel: int3403: replace printk(KERN_WARN...) with pr_warn(...)
  thermal: intel: int340x_thermal: Remove unnecessary acpi_has_method() uses
  thermal: int340x: processor_thermal: Add Ice Lake support
  drivers: thermal: qcom: tsens: Fix memory leak from qfprom read
  thermal: tegra: Fix a typo
  thermal: rcar_gen3_thermal: Replace devm_add_action() followed by failure action with devm_add_action_or_reset()
  thermal: armada: Fix -Wshift-negative-value
  dt-bindings: thermal: qoriq: Add optional clocks property
  thermal: qoriq: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
  thermal: qoriq: Use devm_platform_ioremap_resource() instead of of_iomap()
  thermal: qoriq: Fix error path of calling qoriq_tmu_register_tmu_zone fail
  thermal: qoriq: Add clock operations
  drivers: thermal: processor_thermal_device: Export sysfs interface for TCC offset
parents 7bccb9f1 0f84d1d1

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Required properties: 
Optional property:

- little-endian : If present, the TMU registers are little endian. If absent,

	the default is big endian.

- clocks : the clock for clocking the TMU silicon.



Example:

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -16072,6 +16072,7 @@ THERMAL 
M:	Zhang Rui <rui.zhang@intel.com>

M:	Eduardo Valentin <edubezval@gmail.com>

R:	Daniel Lezcano <daniel.lezcano@linaro.org>

R:	Amit Kucheria <amit.kucheria@verdurent.com>

L:	linux-pm@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git

drivers/thermal/armada_thermal.c

+2 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#define CONTROL0_TSEN_MODE_EXTERNAL	0x2

#define CONTROL0_TSEN_MODE_MASK		0x3



#define CONTROL1_TSEN_AVG_SHIFT		0

#define CONTROL1_TSEN_AVG_MASK		0x7

#define CONTROL1_EXT_TSEN_SW_RESET	BIT(7)

#define CONTROL1_EXT_TSEN_HW_RESETn	BIT(8)
@@ -267,8 +266,8 @@ static void armada_cp110_init(struct platform_device *pdev, 


	/* Average the output value over 2^1 = 2 samples */

	regmap_read(priv->syscon, data->syscon_control1_off, &reg);

	reg &= ~CONTROL1_TSEN_AVG_MASK << CONTROL1_TSEN_AVG_SHIFT;

	reg |= 1 << CONTROL1_TSEN_AVG_SHIFT;

	reg &= ~CONTROL1_TSEN_AVG_MASK;

	reg |= 1;

	regmap_write(priv->syscon, data->syscon_control1_off, reg);

}

drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c

+0 −6
Original line number Diff line number Diff line
@@ -77,9 +77,6 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp, 
	struct acpi_buffer element = { 0, NULL };

	struct acpi_buffer trt_format = { sizeof("RRNNNNNN"), "RRNNNNNN" };



	if (!acpi_has_method(handle, "_TRT"))

		return -ENODEV;



	status = acpi_evaluate_object(handle, "_TRT", NULL, &buffer);

	if (ACPI_FAILURE(status))

		return -ENODEV;
@@ -158,9 +155,6 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp, 
	struct acpi_buffer art_format =	{

		sizeof("RRNNNNNNNNNNN"), "RRNNNNNNNNNNN" };



	if (!acpi_has_method(handle, "_ART"))

		return -ENODEV;



	status = acpi_evaluate_object(handle, "_ART", NULL, &buffer);

	if (ACPI_FAILURE(status))

		return -ENODEV;

drivers/thermal/intel/int340x_thermal/int3403_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int int3403_cdev_add(struct int3403_priv *priv) 


	p = buf.pointer;

	if (!p || (p->type != ACPI_TYPE_PACKAGE)) {

		printk(KERN_WARNING "Invalid PPSS data\n");

		pr_warn("Invalid PPSS data\n");

		kfree(buf.pointer);

		return -EFAULT;

	}