From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jan 2014 01:13:49 +0000 (-0800)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: Ubuntu-5.2.0-15.16~14156
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=91466574be1a3701fab4abf5ac1539b556575a81;p=mirror_ubuntu-eoan-kernel.git

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

Pull thermal management updates from Zhang Rui:
 "This time, the biggest change is the work of representing hardware
  thermal properties in device tree infrastructure.

  This work includes the introduction of a device tree bindings for
  describing the hardware thermal behavior and limits, and also a parser
  to read and interpret the data, and build thermal zones and thermal
  binding parameters.  It also contains three examples on how to use the
  new representation on sensor devices, using three different drivers to
  accomplish it.  One driver is in thermal subsystem, the TI SoC
  thermal, and the other two drivers are in hwmon subsystem.

  Actually, this would be the first step of the complete work because we
  still need to check other potential drivers to be converted and then
  validate the proposed API.  But the reason why I include it in this
  pull request is that, first, this change does not hurt any others
  without using this approach, second, the principle and concept of this
  change would not break after converting the remaining drivers.  BTW,
  as you can see, there are several points in this change that do not
  belong to thermal subsystem.  Because it has been suggested by Guenter
  R that in such cases, it is recommended to send the complete series
  via one single subsystem.

  Specifics:

   - representing hardware thermal properties in device tree
     infrastructure

   - fix a regression that the imx thermal driver breaks system suspend.

   - introduce ACPI INT3403 thermal driver to retrieve temperature data
     from the INT3403 ACPI device object present on some systems.

   - introduce debug statement for thermal core and step_wise governor.

   - assorted fixes and cleanups for thermal core, cpu cooling, exynos
     thrmal, intel powerclamp and imx thermal driver"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
  thermal: remove const flag from .ops of imx thermal
  Thermal: update thermal zone device after setting emul_temp
  intel_powerclamp: Fix cstate counter detection.
  thermal: imx: add necessary clk operation
  Thermal cpu cooling: return error if no valid cpu frequency entry
  thermal: fix cpu_cooling max_level behavior
  thermal: rcar-thermal: Enable driver compilation with COMPILE_TEST
  thermal: debug: add debug statement for core and step_wise
  thermal: imx_thermal: add module device table
  drivers: thermal: Mark function as static in x86_pkg_temp_thermal.c
  thermal:samsung: fix compilation warning
  thermal: imx: correct suspend/resume flow
  thermal: exynos: fix error return code
  Thermal: ACPI INT3403 thermal driver
  MAINTAINERS: add thermal bindings entry in thermal domain
  arm: dts: make OMAP4460 bandgap node to belong to OCP
  arm: dts: make OMAP443x bandgap node to belong to OCP
  arm: dts: add cooling properties on omap5 cpu node
  arm: dts: add omap5 thermal data
  arm: dts: add omap5 CORE thermal data
  ...
---

91466574be1a3701fab4abf5ac1539b556575a81
diff --cc drivers/cpufreq/Kconfig
index d100926aca0a,6b8cde5f98af..4b029c0944af
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@@ -185,8 -181,7 +185,8 @@@ config CPU_FREQ_GOV_CONSERVATIV
  
  config GENERIC_CPUFREQ_CPU0
  	tristate "Generic CPU0 cpufreq driver"
- 	depends on HAVE_CLK && REGULATOR && OF
 -	depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
++	depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
 +	select PM_OPP
  	help
  	  This adds a generic cpufreq driver for CPU0 frequency management.
  	  It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)
diff --cc drivers/cpufreq/cpufreq-cpu0.c
index bb7b3082efb3,91c7bb67bc74..0c12ffc0ebcb
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@@ -29,7 -32,13 +32,8 @@@ static struct device *cpu_dev
  static struct clk *cpu_clk;
  static struct regulator *cpu_reg;
  static struct cpufreq_frequency_table *freq_table;
+ static struct thermal_cooling_device *cdev;
  
 -static unsigned int cpu0_get_speed(unsigned int cpu)
 -{
 -	return clk_get_rate(cpu_clk) / 1000;
 -}
 -
  static int cpu0_set_target(struct cpufreq_policy *policy, unsigned int index)
  {
  	struct dev_pm_opp *opp;