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
  ...

2 files changed, 49 insertions, 5 deletions

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 7e3ef134f1d2..84a55eacd903 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -27,6 +27,8 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/thermal.h>
 #include "lm75.h"
 
 
@@ -71,6 +73,7 @@ static const u8 LM75_REG_TEMP[3] = {
 /* Each client has this additional data */
 struct lm75_data {
         struct device           *hwmon_dev;
+        struct thermal_zone_device      *tz;
         struct mutex            update_lock;
         u8                      orig_conf;
         u8                      resolution;     /* In bits, between 9 and 12 */
@@ -91,22 +94,36 @@ static struct lm75_data *lm75_update_device(struct device *dev);
 
 /*-----------------------------------------------------------------------*/
 
+static inline long lm75_reg_to_mc(s16 temp, u8 resolution)
+{
+        return ((temp >> (16 - resolution)) * 1000) >> (resolution - 8);
+}
+
 /* sysfs attributes for hwmon */
 
+static int lm75_read_temp(void *dev, long *temp)
+{
+        struct lm75_data *data = lm75_update_device(dev);
+
+        if (IS_ERR(data))
+                return PTR_ERR(data);
+
+        *temp = lm75_reg_to_mc(data->temp[0], data->resolution);
+
+        return 0;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *da,
                          char *buf)
 {
         struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct lm75_data *data = lm75_update_device(dev);
-        long temp;
 
         if (IS_ERR(data))
                 return PTR_ERR(data);
 
-        temp = ((data->temp[attr->index] >> (16 - data->resolution)) * 1000)
-               >> (data->resolution - 8);
-
-        return sprintf(buf, "%ld\n", temp);
+        return sprintf(buf, "%ld\n", lm75_reg_to_mc(data->temp[attr->index],
+                                                    data->resolution));
 }
 
 static ssize_t set_temp(struct device *dev, struct device_attribute *da,
@@ -273,6 +290,13 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 goto exit_remove;
         }
 
+        data->tz = thermal_zone_of_sensor_register(&client->dev,
+                                                   0,
+                                                   &client->dev,
+                                                   lm75_read_temp, NULL);
+        if (IS_ERR(data->tz))
+                data->tz = NULL;
+
         dev_info(&client->dev, "%s: sensor '%s'\n",
                  dev_name(data->hwmon_dev), client->name);
 
@@ -287,6 +311,7 @@ static int lm75_remove(struct i2c_client *client)
 {
         struct lm75_data *data = i2c_get_clientdata(client);
 
+        thermal_zone_of_sensor_unregister(&client->dev, data->tz);
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &lm75_group);
         lm75_write_value(client, LM75_REG_CONF, data->orig_conf);
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index d7b47abf37fe..6748b4583e7b 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -27,6 +27,8 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/jiffies.h>
+#include <linux/thermal.h>
+#include <linux/of.h>
 
 #define DRIVER_NAME "tmp102"
 
@@ -50,6 +52,7 @@
 
 struct tmp102 {
         struct device *hwmon_dev;
+        struct thermal_zone_device *tz;
         struct mutex lock;
         u16 config_orig;
         unsigned long last_update;
@@ -93,6 +96,15 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client)
         return tmp102;
 }
 
+static int tmp102_read_temp(void *dev, long *temp)
+{
+        struct tmp102 *tmp102 = tmp102_update_device(to_i2c_client(dev));
+
+        *temp = tmp102->temp[0];
+
+        return 0;
+}
+
 static ssize_t tmp102_show_temp(struct device *dev,
                                 struct device_attribute *attr,
                                 char *buf)
@@ -204,6 +216,12 @@ static int tmp102_probe(struct i2c_client *client,
                 goto fail_remove_sysfs;
         }
 
+        tmp102->tz = thermal_zone_of_sensor_register(&client->dev, 0,
+                                                     &client->dev,
+                                                     tmp102_read_temp, NULL);
+        if (IS_ERR(tmp102->tz))
+                tmp102->tz = NULL;
+
         dev_info(&client->dev, "initialized\n");
 
         return 0;
@@ -220,6 +238,7 @@ static int tmp102_remove(struct i2c_client *client)
 {
         struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
+        thermal_zone_of_sensor_unregister(&client->dev, tmp102->tz);
         hwmon_device_unregister(tmp102->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);