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

Pull thermal updates from Zhang Rui:

 - Implement generic devfreq cooling mechanism through frequency
   reduction for devices using devfreq.  From Ørjan Eide and Javi
   Merino.

 - Introduce OMAP3 support on TI SoC thermal driver.  From Pavel Mack
   and Eduardo Valentin.

 - A bounch of small fixes on devfreq_cooling, Exynos, IMX, Armada, and
   Rockchip thermal drivers.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (24 commits)
  thermal: exynos: Directly return 0 instead of using local ret variable
  thermal: exynos: Remove unneeded semicolon
  thermal: exynos: Use IS_ERR() because regulator cannot be NULL
  thermal: exynos: Fix first temperature read after registering sensor
  thermal: exynos: Fix unbalanced regulator disable on probe failure
  devfreq_cooling: return on allocation failure
  thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r
  dt-bindings: rockchip-thermal: Add the pinctrl states in this document
  thermal: devfreq_cooling: Make power a u64
  thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister
  thermal: underflow bug in imx_set_trip_temp()
  thermal: armada: Fix possible overflow in the Armada 380 thermal sensor formula
  thermal: imx: register irq handler later in probe
  thermal: rockhip: fix setting thermal shutdown polarity
  thermal: rockchip: fix handling of invalid readings
  devfreq_cooling: add trace information
  thermal: Add devfreq cooling
  PM / OPP: get the voltage for all OPPs
  tools/thermal: tmon: use pkg-config also for CFLAGS
  linux/thermal.h: rename KELVIN_TO_CELSIUS to DECI_KELVIN_TO_CELSIUS
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 30d8518b25fb..82707f9824ca 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -315,7 +315,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                         if (crt == -1) {
                                 tz->trips.critical.flags.valid = 0;
                         } else if (crt > 0) {
-                                unsigned long crt_k = CELSIUS_TO_KELVIN(crt);
+                                unsigned long crt_k = CELSIUS_TO_DECI_KELVIN(crt);
                                 /*
                                  * Allow override critical threshold
                                  */
@@ -351,7 +351,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                 if (psv == -1) {
                         status = AE_SUPPORT;
                 } else if (psv > 0) {
-                        tmp = CELSIUS_TO_KELVIN(psv);
+                        tmp = CELSIUS_TO_DECI_KELVIN(psv);
                         status = AE_OK;
                 } else {
                         status = acpi_evaluate_integer(tz->device->handle,
@@ -431,7 +431,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                         break;
                                 if (i == 1)
                                         tz->trips.active[0].temperature =
-                                                CELSIUS_TO_KELVIN(act);
+                                                CELSIUS_TO_DECI_KELVIN(act);
                                 else
                                         /*
                                          * Don't allow override higher than
@@ -439,9 +439,9 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                                          */
                                         tz->trips.active[i - 1].temperature =
                                                 (tz->trips.active[i - 2].temperature <
-                                                CELSIUS_TO_KELVIN(act) ?
+                                                CELSIUS_TO_DECI_KELVIN(act) ?
                                                 tz->trips.active[i - 2].temperature :
-                                                CELSIUS_TO_KELVIN(act));
+                                                CELSIUS_TO_DECI_KELVIN(act));
                                 break;
                         } else {
                                 tz->trips.active[i].temperature = tmp;
@@ -1105,7 +1105,7 @@ static int acpi_thermal_add(struct acpi_device *device)
         INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn);
 
         pr_info(PREFIX "%s [%s] (%ld C)\n", acpi_device_name(device),
-                acpi_device_bid(device), KELVIN_TO_CELSIUS(tz->temperature));
+                acpi_device_bid(device), DECI_KELVIN_TO_CELSIUS(tz->temperature));
         goto end;
 
 free_memory: