[V4,00/13] Thermal: generic thermal layer enhancement

Commit Message

Eduardo Valentin Aug. 21, 2012, 5:10 a.m. UTC

Hello Rui,

On Mon, Aug 20, 2012 at 06:53:36PM +0300, Eduardo Valentin wrote:
> Hello Rui,
> 
> On Thu, Jul 26, 2012 at 04:41:10PM +0800, Zhang Rui wrote:
> > 
> > Hi, all,
> > 
> > This is the patch set for linux-next.
> 
> The patch series looks good to me. The only issue is that, as now the omap-thermal
> driver is under staging directory, you might want to update the series to cover it as
> well (patches 03 and 05). I can provide you patches if you wish, but I'd recommend to
> write atomic patches so that we always keep the tree in one piece.
> 
> Let me know what you think.

Here is the differential diff on omap-thermal-common.c, on top of this series, which pretty much same diff
compared to your branch. First hunk is on patch 03/13. Second one on patch 05/13. Feel free to include
those on your patches.



> 
> > 
> > the changes includes:
> > 
> > V4:
> > - dropped three patches which have been already picked by Len.
> > - re-organize some piece of code based on Rafael's comments
> > - improve some changelog
> > 
> > V3: http://marc.info/?l=linux-acpi&m=134318254518940&w=2
> > - fixing a build error.
> > - making a couple of changes based on Rafael's comments
> > - removing the plist patch for now as I do not have validate data to show how much benefit it brings.
> > 
> > V2: http://marc.info/?l=linux-acpi&m=134267975014396&w=2
> > - a couple of changes based on Eduardo and Amit's comments.
> > - convert an internal list to plist to be more efficiency.
> > 
> > V1: http://marc.info/?l=linux-acpi&m=133938485224765&w=2
> > - 12 RFC patches to fix the problems discussed in http://marc.info/?l=linux-acpi&m=133836783425764&w=2
> > 
> > please kindly review.
> > 
> > Any comments are welcome.
> > 
> > thanks,
> > rui
> > 
> > ---------------------------------------------------------------------------
> > Zhang Rui (13):
> >       Thermal: Introduce multiple cooling states support
> >       Thermal: Introduce cooling states range support
> >       Thermal: set upper and lower limits
> >       Thermal: Introduce .get_trend() callback.
> >       Thermal: Remove tc1/tc2 in generic thermal layer.
> >       Thermal: Introduce thermal_zone_trip_update()
> >       Thermal: rename structure thermal_cooling_device_instance to thermal_instance
> >       Thermal: Rename thermal_zone_device.cooling_devices to thermal_zone_device.instances
> >       Thermal: Rename thermal_instance.node to thermal_instance.tz_node.
> >       Thermal: List thermal_instance in thermal_cooling_device.
> >       Thermal: Introduce simple arbitrator for setting device cooling state
> >       Thermal: Unify the code for both active and passive cooling
> >       Thermal: Introduce locking for cdev.thermal_instances
> > ---------------------------------------------------------------------------
> >  Documentation/thermal/sysfs-api.txt      |    9 +-
> >  drivers/acpi/thermal.c                   |   98 +++++++---
> >  drivers/platform/x86/acerhdf.c           |    5 +-
> >  drivers/platform/x86/intel_mid_thermal.c |    2 +-
> >  drivers/thermal/spear_thermal.c          |    2 +-
> >  drivers/thermal/thermal_sys.c            |  308 +++++++++++++++++++-----------
> >  include/linux/thermal.h                  |   28 ++-
> >  7 files changed, 300 insertions(+), 152 deletions(-)
> > ---------------------------------------------------------------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drivers/staging/omap-thermal/omap-thermal-common.c
index 0675a5e..b4cd6cc 100644
--- a/drivers/staging/omap-thermal/omap-thermal-common.c
+++ b/drivers/staging/omap-thermal/omap-thermal-common.c
@@ -120,7 +120,9 @@  static int omap_thermal_bind(struct thermal_zone_device *thermal,
 
        /* TODO: bind with min and max states */
        /* Simple thing, two trips, one passive another critical */
-       return thermal_zone_bind_cooling_device(thermal, 0, cdev);
+       return thermal_zone_bind_cooling_device(thermal, 0, cdev,
+                                               THERMAL_NO_LIMIT,
+                                               THERMAL_NO_LIMIT);
 }
 
 /* Unbind callback functions for thermal zone */
@@ -246,7 +248,7 @@  int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id,
        /* Create thermal zone */
        data->omap_thermal = thermal_zone_device_register(domain,
                                OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
-                               0, FAST_TEMP_MONITORING_RATE, 0, 0);
+                               0, FAST_TEMP_MONITORING_RATE);
        if (IS_ERR_OR_NULL(data->omap_thermal)) {
                dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
                return PTR_ERR(data->omap_thermal);