[GIT PULL] Thermal management updates for v4.21-rc1

[Zhang Rui]

Hi, Linus,

Please pull from
 git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git next

to receive the latest Thermal management updates for v4.21-rc1 with
top-most commit 24ef9ec891c761483c5270528781b8637b908eef:

 thermal/intel: fixup for Kconfig string parsing tightening up (2019-
01-03 23:52:28 +0800)

on top of commit 2e6e902d185027f8e3cb8b7305238f7e35d6a436:

 Linux 4.20-rc4 (2018-11-25 14:19:31 -0800)

Note that commit 8636a1f9677d ("treewide: surround Kconfig file paths
with double quotes") makes some change to drivers/thermal/Kconfig, and
introduces a merge conflict. A manual merge is needed and commit
24ef9ec891c7 ("thermal/intel: fixup for Kconfig string parsing
tightening up") is applied in my tree in the last minute (it was kept
by Stephen Rothwell in linux-next previously).

Specifics:

- Add locking for cooling device sysfs attribute in case the cooling
device state is changed by userspace and thermal framework
simultaneously. (Thara Gopinath)

- Fix a problem that passive cooling is reset improperly after system
suspend/resume. (Wei Wang)

- Cleanup the driver/thermal/ directory by moving intel and qcom
platform specific drivers to platform specific sub-directories. (Amit
Kucheria)

- Some trivial cleanups. (Lukasz Luba, Wolfram Sang)

thanks,
rui



----------------------------------------------------------------
Amit Kucheria (2):
ÂÂÂÂÂÂdrivers: thermal: Move various drivers for intel platforms into a
subdir
ÂÂÂÂÂÂdrivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir

Lukasz Luba (1):
ÂÂÂÂÂÂthermal: remove unused function parameter

Stephen Rothwell (1):
ÂÂÂÂÂÂthermal/intel: fixup for Kconfig string parsing tightening up

Thara Gopinath (1):
ÂÂÂÂÂÂthermal: Fix locking in cooling device sysfs update cur_state

Wei Wang (1):
ÂÂÂÂÂÂThermal: do not clear passive state during system sleep

Wolfram Sang (5):
ÂÂÂÂÂÂthermal: int340x_thermal: int3400_thermal: simplify getting
.driver_data
ÂÂÂÂÂÂthermal: rockchip_thermal: simplify getting .driver_data
ÂÂÂÂÂÂthermal: spear_thermal: simplify getting .driver_data
ÂÂÂÂÂÂthermal: st: st_thermal: simplify getting .driver_data
ÂÂÂÂÂÂthermal: zx2967_thermal: simplify getting .driver_data

Zhang Rui (1):
ÂÂÂÂÂÂMerge branches 'for-rc' and 'thermal-core' into next

Âdrivers/thermal/KconfigÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 94 ++----------
----------
Âdrivers/thermal/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 10 +--
Âdrivers/thermal/intel/KconfigÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 77
++++++++++++++++++
Âdrivers/thermal/intel/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 12 +++
Â.../thermal/{ => intel}/int340x_thermal/KconfigÂÂÂÂ|ÂÂ0
Â.../thermal/{ => intel}/int340x_thermal/MakefileÂÂÂ|ÂÂ0
Â.../{ => intel}/int340x_thermal/acpi_thermal_rel.c |ÂÂ0
Â.../{ => intel}/int340x_thermal/acpi_thermal_rel.h |ÂÂ0
Â.../{ => intel}/int340x_thermal/int3400_thermal.cÂÂ|ÂÂ9 +--
Â.../{ => intel}/int340x_thermal/int3402_thermal.cÂÂ|ÂÂ0
Â.../{ => intel}/int340x_thermal/int3403_thermal.cÂÂ|ÂÂ0
Â.../{ => intel}/int340x_thermal/int3406_thermal.cÂÂ|ÂÂ0
Â.../int340x_thermal/int340x_thermal_zone.cÂÂÂÂÂÂÂÂÂ|ÂÂ0
Â.../int340x_thermal/int340x_thermal_zone.hÂÂÂÂÂÂÂÂÂ|ÂÂ0
Â.../int340x_thermal/processor_thermal_device.cÂÂÂÂÂ|ÂÂ0
Â.../thermal/{ => intel}/intel_bxt_pmic_thermal.cÂÂÂ|ÂÂ0
Âdrivers/thermal/{ => intel}/intel_pch_thermal.cÂÂÂÂ|ÂÂ0
Âdrivers/thermal/{ => intel}/intel_powerclamp.cÂÂÂÂÂ|ÂÂ0
Â.../thermal/{ => intel}/intel_quark_dts_thermal.cÂÂ|ÂÂ0
Âdrivers/thermal/{ => intel}/intel_soc_dts_iosf.cÂÂÂ|ÂÂ0
Âdrivers/thermal/{ => intel}/intel_soc_dts_iosf.hÂÂÂ|ÂÂ0
Â.../thermal/{ => intel}/intel_soc_dts_thermal.cÂÂÂÂ|ÂÂ0
Âdrivers/thermal/{ => intel}/x86_pkg_temp_thermal.c |ÂÂ0
Âdrivers/thermal/qcom/KconfigÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 11 +++
Âdrivers/thermal/qcom/MakefileÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ1 +
Âdrivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.cÂÂ|ÂÂ2 +-
Âdrivers/thermal/rockchip_thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ8 +-
Âdrivers/thermal/spear_thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ8 +-
Âdrivers/thermal/st/st_thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ6 +-
Âdrivers/thermal/thermal_core.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 18 +++--
Âdrivers/thermal/thermal_sysfs.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ| 11 ++-
Âdrivers/thermal/zx2967_thermal.cÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ|ÂÂ6 +-
Â32 files changed, 138 insertions(+), 135 deletions(-)
Âcreate mode 100644 drivers/thermal/intel/Kconfig
Âcreate mode 100644 drivers/thermal/intel/Makefile
Ârename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c
(100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h
(100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c
(96%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c
(100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c
(100%)
Ârename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c
(100%)
Ârename drivers/thermal/{ =>
intel}/int340x_thermal/int340x_thermal_zone.c (100%)
Ârename drivers/thermal/{ =>
intel}/int340x_thermal/int340x_thermal_zone.h (100%)
Ârename drivers/thermal/{ =>
intel}/int340x_thermal/processor_thermal_device.c (100%)
Ârename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%)
Ârename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
Ârename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
Ârename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%)
Ârename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
Ârename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
Ârename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%)
Ârename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
Ârename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (99%)