11 files changed, 42 insertions, 18 deletions

diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index 87519cb379ee..7ec632ed9769 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -95,7 +95,7 @@ temperature) and throttle appropriate devices.
 1.3 interface for binding a thermal zone device with a thermal cooling device
 1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
         int trip, struct thermal_cooling_device *cdev,
-        unsigned long upper, unsigned long lower);
+        unsigned long upper, unsigned long lower, unsigned int weight);
 
     This interface function bind a thermal cooling device to the certain trip
     point of a thermal zone device.
@@ -110,6 +110,8 @@ temperature) and throttle appropriate devices.
     lower:the Minimum cooling state can be used for this trip point.
           THERMAL_NO_LIMIT means no lower limit,
           and the cooling device can be in cooling state 0.
+    weight: the influence of this cooling device in this thermal
+            zone.  See 1.4.1 below for more information.
 
 1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
                 int trip, struct thermal_cooling_device *cdev);
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index d24fa1964eb8..6d4e44ea74ac 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -800,7 +800,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                                 result =
                                         thermal_zone_bind_cooling_device
                                         (thermal, trip, cdev,
-                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT);
+                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT,
+                                         THERMAL_WEIGHT_DEFAULT);
                         else
                                 result =
                                         thermal_zone_unbind_cooling_device
@@ -824,7 +825,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                         if (bind)
                                 result = thermal_zone_bind_cooling_device
                                         (thermal, trip, cdev,
-                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT);
+                                         THERMAL_NO_LIMIT, THERMAL_NO_LIMIT,
+                                         THERMAL_WEIGHT_DEFAULT);
                         else
                                 result = thermal_zone_unbind_cooling_device
                                         (thermal, trip, cdev);
@@ -841,7 +843,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
                                 result = thermal_zone_bind_cooling_device
                                                 (thermal, THERMAL_TRIPS_NONE,
                                                  cdev, THERMAL_NO_LIMIT,
-                                                 THERMAL_NO_LIMIT);
+                                                 THERMAL_NO_LIMIT,
+                                                 THERMAL_WEIGHT_DEFAULT);
                         else
                                 result = thermal_zone_unbind_cooling_device
                                                 (thermal, THERMAL_TRIPS_NONE,
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index 594c918b553d..1ef02daddb60 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -372,7 +372,8 @@ static int acerhdf_bind(struct thermal_zone_device *thermal,
                 return 0;
 
         if (thermal_zone_bind_cooling_device(thermal, 0, cdev,
-                        THERMAL_NO_LIMIT, THERMAL_NO_LIMIT)) {
+                        THERMAL_NO_LIMIT, THERMAL_NO_LIMIT,
+                        THERMAL_WEIGHT_DEFAULT)) {
                 pr_err("error binding cooling dev\n");
                 return -EINVAL;
         }
diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c
index 20adfbe27df1..2fb273c4baa9 100644
--- a/drivers/thermal/db8500_thermal.c
+++ b/drivers/thermal/db8500_thermal.c
@@ -76,7 +76,7 @@ static int db8500_cdev_bind(struct thermal_zone_device *thermal,
                 upper = lower = i > max_state ? max_state : i;
 
                 ret = thermal_zone_bind_cooling_device(thermal, i, cdev,
-                        upper, lower);
+                        upper, lower, THERMAL_WEIGHT_DEFAULT);
 
                 dev_info(&cdev->device, "%s bind to %d: %d-%s\n", cdev->type,
                         i, ret, ret ? "fail" : "succeed");
diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c
index 6e0a3fbfae86..c3b25187b467 100644
--- a/drivers/thermal/fair_share.c
+++ b/drivers/thermal/fair_share.c
@@ -109,7 +109,7 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip)
                         continue;
 
                 instance->target = get_target_state(tz, cdev,
-                                        tzp->tbp[i].weight, cur_trip_level);
+                                        instance->weight, cur_trip_level);
 
                 instance->cdev->updated = false;
                 thermal_cdev_update(cdev);
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 2ccbc0788353..fde4c2876d14 100644
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -306,7 +306,8 @@ static int imx_bind(struct thermal_zone_device *tz,
 
         ret = thermal_zone_bind_cooling_device(tz, IMX_TRIP_PASSIVE, cdev,
                                                THERMAL_NO_LIMIT,
-                                               THERMAL_NO_LIMIT);
+                                               THERMAL_NO_LIMIT,
+                                               THERMAL_WEIGHT_DEFAULT);
         if (ret) {
                 dev_err(&tz->device,
                         "binding zone %s with cdev %s failed:%d\n",
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index 668fb1bdea9e..c606b85ea9f4 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -227,7 +227,8 @@ static int of_thermal_bind(struct thermal_zone_device *thermal,
                         ret = thermal_zone_bind_cooling_device(thermal,
                                                 tbp->trip_id, cdev,
                                                 tbp->max,
-                                                tbp->min);
+                                                tbp->min,
+                                                tbp->usage);
                         if (ret)
                                 return ret;
                 }
@@ -581,7 +582,7 @@ static int thermal_of_populate_bind_params(struct device_node *np,
         u32 prop;
 
         /* Default weight. Usage is optional */
-        __tbp->usage = 0;
+        __tbp->usage = THERMAL_WEIGHT_DEFAULT;
         ret = of_property_read_u32(np, "contribution", &prop);
         if (ret == 0)
                 __tbp->usage = prop;
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 4108db7e10c1..a6cb9b78b629 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -218,7 +218,8 @@ static void print_bind_err_msg(struct thermal_zone_device *tz,
 
 static void __bind(struct thermal_zone_device *tz, int mask,
                         struct thermal_cooling_device *cdev,
-                        unsigned long *limits)
+                        unsigned long *limits,
+                        unsigned int weight)
 {
         int i, ret;
 
@@ -233,7 +234,8 @@ static void __bind(struct thermal_zone_device *tz, int mask,
                                 upper = limits[i * 2 + 1];
                         }
                         ret = thermal_zone_bind_cooling_device(tz, i, cdev,
-                                                               upper, lower);
+                                                               upper, lower,
+                                                               weight);
                         if (ret)
                                 print_bind_err_msg(tz, cdev, ret);
                 }
@@ -280,7 +282,8 @@ static void bind_cdev(struct thermal_cooling_device *cdev)
                                 continue;
                         tzp->tbp[i].cdev = cdev;
                         __bind(pos, tzp->tbp[i].trip_mask, cdev,
-                               tzp->tbp[i].binding_limits);
+                               tzp->tbp[i].binding_limits,
+                               tzp->tbp[i].weight);
                 }
         }
 
@@ -319,7 +322,8 @@ static void bind_tz(struct thermal_zone_device *tz)
                                 continue;
                         tzp->tbp[i].cdev = pos;
                         __bind(tz, tzp->tbp[i].trip_mask, pos,
-                               tzp->tbp[i].binding_limits);
+                               tzp->tbp[i].binding_limits,
+                               tzp->tbp[i].weight);
                 }
         }
 exit:
@@ -713,7 +717,8 @@ passive_store(struct device *dev, struct device_attribute *attr,
                                 thermal_zone_bind_cooling_device(tz,
                                                 THERMAL_TRIPS_NONE, cdev,
                                                 THERMAL_NO_LIMIT,
-                                                THERMAL_NO_LIMIT);
+                                                THERMAL_NO_LIMIT,
+                                                THERMAL_WEIGHT_DEFAULT);
                 }
                 mutex_unlock(&thermal_list_lock);
                 if (!tz->passive_delay)
@@ -931,6 +936,9 @@ static const struct attribute_group *cooling_device_attr_groups[] = {
  * @lower:      the Minimum cooling state can be used for this trip point.
  *              THERMAL_NO_LIMIT means no lower limit,
  *              and the cooling device can be in cooling state 0.
+ * @weight:     The weight of the cooling device to be bound to the
+ *              thermal zone. Use THERMAL_WEIGHT_DEFAULT for the
+ *              default value
  *
  * This interface function bind a thermal cooling device to the certain trip
  * point of a thermal zone device.
@@ -941,7 +949,8 @@ static const struct attribute_group *cooling_device_attr_groups[] = {
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
                                      int trip,
                                      struct thermal_cooling_device *cdev,
-                                     unsigned long upper, unsigned long lower)
+                                     unsigned long upper, unsigned long lower,
+                                     unsigned int weight)
 {
         struct thermal_instance *dev;
         struct thermal_instance *pos;
@@ -986,6 +995,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
         dev->upper = upper;
         dev->lower = lower;
         dev->target = THERMAL_NO_TARGET;
+        dev->weight = weight;
 
         result = get_idr(&tz->idr, &tz->lock, &dev->id);
         if (result)
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 0531c752fbbb..7a465e9d456c 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -48,6 +48,7 @@ struct thermal_instance {
         struct device_attribute attr;
         struct list_head tz_node; /* node in tz->thermal_instances */
         struct list_head cdev_node; /* node in cdev->thermal_instances */
+        unsigned int weight; /* The weight of the cooling device */
 };
 
 int thermal_register_governor(struct thermal_governor *);
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index a38c1756442a..cb45e729adb5 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -146,7 +146,8 @@ static int ti_thermal_bind(struct thermal_zone_device *thermal,
         return thermal_zone_bind_cooling_device(thermal, 0, cdev,
         /* bind with min and max states defined by cpu_cooling */
                                                 THERMAL_NO_LIMIT,
-                                                THERMAL_NO_LIMIT);
+                                                THERMAL_NO_LIMIT,
+                                                THERMAL_WEIGHT_DEFAULT);
 }
 
 /* Unbind callback functions for thermal zone */
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 5eac316490ea..00dacd4dfdce 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -40,6 +40,9 @@
 /* No upper/lower limit requirement */
 #define THERMAL_NO_LIMIT        ((u32)~0)
 
+/* Default weight of a bound cooling device */
+#define THERMAL_WEIGHT_DEFAULT 0
+
 /* Unit conversion macros */
 #define KELVIN_TO_CELSIUS(t)    (long)(((long)t-2732 >= 0) ?    \
                                 ((long)t-2732+5)/10 : ((long)t-2732-5)/10)
@@ -323,7 +326,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *);
 
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
                                      struct thermal_cooling_device *,
-                                     unsigned long, unsigned long);
+                                     unsigned long, unsigned long,
+                                     unsigned int);
 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
                                        struct thermal_cooling_device *);
 void thermal_zone_device_update(struct thermal_zone_device *);