From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 May 2017 18:58:45 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6a776e47a045462a1df1a3a9592598259ffd614f;p=openwrt%2Fstaging%2Fblogic.git

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

Pull thermal management updates from Zhang Rui:

 - Fix a problem where orderly_shutdown() is called for multiple times
   due to multiple critical overheating events raised in a short period
   by platform thermal driver. (Keerthy)

 - Introduce a backup thermal shutdown mechanism, which invokes
   kernel_power_off()/emergency_restart() directly, after
   orderly_shutdown() being issued for certain amount of time(specified
   via Kconfig). This is useful in certain conditions that userspace may
   be unable to power off the system in a clean manner and leaves the
   system in a critical state, like in the middle of driver probing
   phase. (Keerthy)

 - Introduce a new interface in thermal devfreq_cooling code so that the
   driver can provide more precise data regarding actual power to the
   thermal governor every time the power budget is calculated. (Lukasz
   Luba)

 - Introduce BCM 2835 soc thermal driver and northstar thermal driver,
   within a new sub-folder. (Rafał Miłecki)

 - Introduce DA9062/61 thermal driver. (Steve Twiss)

 - Remove non-DT booting on TI-SoC driver. Also add support to fetching
   coefficients from DT. (Keerthy)

 - Refactorf RCAR Gen3 thermal driver. (Niklas Söderlund)

 - Small fix on MTK and intel-soc-dts thermal driver. (Dawei Chien,
   Brian Bian)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (25 commits)
  thermal: core: Add a back up thermal shutdown mechanism
  thermal: core: Allow orderly_poweroff to be called only once
  Thermal: Intel SoC DTS: Change interrupt request behavior
  trace: thermal: add another parameter 'power' to the tracing function
  thermal: devfreq_cooling: add new interface for direct power read
  thermal: devfreq_cooling: refactor code and add get_voltage function
  thermal: mt8173: minor mtk_thermal.c cleanups
  thermal: bcm2835: move to the broadcom subdirectory
  thermal: broadcom: ns: specify myself as MODULE_AUTHOR
  thermal: da9062/61: Thermal junction temperature monitoring driver
  Documentation: devicetree: thermal: da9062/61 TJUNC temperature binding
  thermal: broadcom: add Northstar thermal driver
  dt-bindings: thermal: add support for Broadcom's Northstar thermal
  thermal: bcm2835: add thermal driver for bcm2835 SoC
  dt-bindings: Add thermal zone to bcm2835-thermal example
  thermal: rcar_gen3_thermal: add suspend and resume support
  thermal: rcar_gen3_thermal: store device match data in private structure
  thermal: rcar_gen3_thermal: enable hardware interrupts for trip points
  thermal: rcar_gen3_thermal: record and check number of TSCs found
  thermal: rcar_gen3_thermal: check that TSC exists before memory allocation
  ...
---

6a776e47a045462a1df1a3a9592598259ffd614f
diff --cc drivers/thermal/Kconfig
index 6871ecc5b951,4edc011fe4a5..b5b5facb8747
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -291,6 -308,28 +308,16 @@@ config ARMADA_THERMA
  	  Enable this option if you want to have support for thermal management
  	  controller present in Armada 370 and Armada XP SoC.
  
 -config DB8500_CPUFREQ_COOLING
 -	tristate "DB8500 cpufreq cooling"
 -	depends on ARCH_U8500 || COMPILE_TEST
 -	depends on HAS_IOMEM
 -	depends on CPU_THERMAL
 -	default y
 -	help
 -	  Adds DB8500 cpufreq cooling devices, and these cooling devices can be
 -	  bound to thermal zone trip points. When a trip point reached, the
 -	  bound cpufreq cooling device turns active to set CPU frequency low to
 -	  cool down the CPU.
 -
+ config DA9062_THERMAL
+ 	tristate "DA9062/DA9061 Dialog Semiconductor thermal driver"
+ 	depends on MFD_DA9062 || COMPILE_TEST
+ 	depends on OF
+ 	help
+ 	  Enable this for the Dialog Semiconductor thermal sensor driver.
+ 	  This will report PMIC junction over-temperature for one thermal trip
+ 	  zone.
+ 	  Compatible with the DA9062 and DA9061 PMICs.
+ 
  config INTEL_POWERCLAMP
  	tristate "Intel PowerClamp idle injection driver"
  	depends on THERMAL
diff --cc drivers/thermal/Makefile
index c2372f10dae5,e6834061da28..094d7039981c
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@@ -41,6 -42,8 +42,7 @@@ obj-$(CONFIG_TANGO_THERMAL)	+= tango_th
  obj-$(CONFIG_IMX_THERMAL)	+= imx_thermal.o
  obj-$(CONFIG_MAX77620_THERMAL)	+= max77620_thermal.o
  obj-$(CONFIG_QORIQ_THERMAL)	+= qoriq_thermal.o
 -obj-$(CONFIG_DB8500_CPUFREQ_COOLING)	+= db8500_cpufreq_cooling.o
+ obj-$(CONFIG_DA9062_THERMAL)	+= da9062-thermal.o
  obj-$(CONFIG_INTEL_POWERCLAMP)	+= intel_powerclamp.o
  obj-$(CONFIG_X86_PKG_TEMP_THERMAL)	+= x86_pkg_temp_thermal.o
  obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE)	+= intel_soc_dts_iosf.o