summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJonghwa Lee <jonghwa3.lee@samsung.com>2013-11-01 18:44:14 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:45:20 +0900
commit8a6a13e55f7399df05cbc3535ac521f11d3452c1 (patch)
tree232222d589850328d2228fe0774828a783995fbd /include
parentf39a81fed2cfc8a059daf2e1bddfb5586acb0733 (diff)
downloadlinux-3.10-8a6a13e55f7399df05cbc3535ac521f11d3452c1.tar.gz
linux-3.10-8a6a13e55f7399df05cbc3535ac521f11d3452c1.tar.bz2
linux-3.10-8a6a13e55f7399df05cbc3535ac521f11d3452c1.zip
thermal: Add ommitted codes from merging.
Add omitted codes from commits, <commit-id d9e6913d1> "drivers: thermal: add check when ~ ", and <commit-id efbf8d7a3> "thermal: thermal_core: allow binding with ~" Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/thermal.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index f1aa3c23274..b316bdfc91a 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -209,6 +209,16 @@ struct thermal_bind_params {
* See Documentation/thermal/sysfs-api.txt for more information.
*/
int trip_mask;
+
+ /*
+ * This is an array of cooling state limits. Must have exactly
+ * 2 * thermal_zone.number_of_trip_points. It is an array consisting
+ * of tuples <lower-state upper-state> of state limits. Each trip
+ * will be associated with one state limit tuple when binding.
+ * A NULL pointer means <THERMAL_NO_LIMITS THERMAL_NO_LIMITS>
+ * on all trips.
+ */
+ unsigned long *binding_limits;
int (*match) (struct thermal_zone_device *tz,
struct thermal_cooling_device *cdev);
};
@@ -216,6 +226,14 @@ struct thermal_bind_params {
/* Structure to define Thermal Zone parameters */
struct thermal_zone_params {
char governor_name[THERMAL_NAME_LENGTH];
+
+ /*
+ * a boolean to indicate if the thermal to hwmon sysfs interface
+ * is required. when no_hwmon == false, a hwmon sysfs interface
+ * will be created. when no_hwmon == true, nothing will be done
+ */
+ bool no_hwmon;
+
int num_tbps; /* Number of tbp entries */
struct thermal_bind_params *tbp;
};