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

Commit 9346116d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal management updates from Zhang Rui:

 - Thermal core code reorganization and cleanup. Two new files are
   created for thermal sysfs I/F code and thermal helper functions
   (Eduardo Valentin).

 - Sanitize hotplug and locking for x86_pkg_temp driver (Thomas
   Gleixner)

 - Update MAINTAINER file for pwm-fan driver and Samsung thermal driver
   (Lukasz Majewski)

 - Fix module auto-load for max77620, tango and db8500 thermal driver
   (Javier Martinez Canillas)

 - Fix a bug that thermal hwmon sysfs I/F returns wrong critical trip
   point temperature value (Krzysztof Kozlowski)

 - Add Skylake PCH 100 series support for intel_pch_thermal driver
   (OGAWA Hirofumi)

 - Small fixes and cleanups for platform thermal drivers (Julia Lawall,
   Luis Henriques, Leo Yan, Stephen Boyd, Shawn Lin, Javi Merino and
   Lukasz Luba)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (76 commits)
  MAINTAINERS: Samsung: Update maintainer for PWM FAN and SAMSUNG THERMAL
  thermal/x86 pkg temp: Convert to hotplug state machine
  thermal/x86_pkg_temp: Sanitize package management
  thermal/x86_pkg_temp: Move work into package struct
  thermal/x86_pkg_temp: Move work scheduled flag into package struct
  thermal/x86_pkg_temp: Sanitize locking
  thermal/x86_pkg_temp: Cleanup code some more
  thermal/x86_pkg_temp: Cleanup namespace
  thermal/x86_pkg_temp: Get rid of ref counting
  thermal/x86_pkg_temp: Sanitize callback (de)initialization
  thermal/x86_pkg_temp: Replace open coded cpu search
  thermal/x86_pkg_temp: Remove redundant package search
  thermal/x86_pkg_temp: Cleanup thermal interrupt handling
  thermal: hwmon: Properly report critical temperature in sysfs
  devfreq_cooling: pass a pointer to devfreq in the power model callbacks
  devfreq_cooling: make the structs devfreq_cooling_xxx visible for all
  dt-bindings: rockchip-thermal: fix the misleading description
  thermal: rockchip: improve the warning log
  thermal: db8500: Fix module autoload
  thermal: tango: Fix module autoload
  ...
parents b8d2798f 0faf7dd5

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

+3 −0
Original line number Diff line number Diff line
@@ -22,10 +22,13 @@ Required properties: 
	      TSADC controller.

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

- #thermal-sensor-cells : Should be 1. See ./thermal.txt 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 {

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -9838,7 +9838,7 @@ F: drivers/media/usb/pwc/* 


PWM FAN DRIVER

M:	Kamil Debski <kamil@wypas.org>

M:	Lukasz Majewski <l.majewski@samsung.com>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-hwmon@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@ -10609,7 +10609,7 @@ L: netdev@vger.kernel.org 
F:	drivers/net/ethernet/samsung/sxgbe/



SAMSUNG THERMAL DRIVER

M:	Lukasz Majewski <l.majewski@samsung.com>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-pm@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Supported

drivers/thermal/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ config THERMAL_EMULATION 


config HISI_THERMAL

	tristate "Hisilicon thermal driver"

	depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST

	depends on ARCH_HISI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF

	default y

	help

	  Enable this to plug hisilicon's thermal sensor driver into the Linux

	  thermal framework. cpufreq is used as the cooling device to throttle

drivers/thermal/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#



obj-$(CONFIG_THERMAL)		+= thermal_sys.o

thermal_sys-y			+= thermal_core.o

thermal_sys-y			+= thermal_core.o thermal_sysfs.o \

					thermal_helpers.o



# interface to/from other layers providing sensors

thermal_sys-$(CONFIG_THERMAL_HWMON)		+= thermal_hwmon.o

drivers/thermal/db8500_thermal.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static const struct of_device_id db8500_thermal_match[] = { 
	{ .compatible = "stericsson,db8500-thermal" },

	{},

};

MODULE_DEVICE_TABLE(of, db8500_thermal_match);

#endif



static struct platform_driver db8500_thermal_driver = {