From 211c09b5d97072bea1e282bdd0ca236f8fbdee5b Mon Sep 17 00:00:00 2001 From: Jinyoung Park Date: Thu, 21 Mar 2013 16:44:38 +0900 Subject: drivers: misc: therm_est: Add multiple trip points support Replaced cdev_typa and trip_temp to struct thermal_trip_info to support multiple trip points on therm_est. And the struct thermal_trip_info has hysteresis for trip temp. So applied hysteresis to trip temp. Bug 1233363 Bug 1236444 Signed-off-by: Jinyoung Park Reviewed-on: http://git-master/r/211123 (cherry picked from commit d832906d904916a263c831d1bf55031070818991) Change-Id: I6ce2806a323c25ec298291d1e4ee067c3adaebfa Signed-off-by: Jinyoung Park Reviewed-on: http://git-master/r/215542 --- include/linux/therm_est.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'include/linux') diff --git a/include/linux/therm_est.h b/include/linux/therm_est.h index 8877108af..f1ccbf0de 100644 --- a/include/linux/therm_est.h +++ b/include/linux/therm_est.h @@ -1,7 +1,7 @@ /* * include/linux/therm_est.h * - * Copyright (c) 2010-2012, NVIDIA Corporation. + * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -18,6 +18,8 @@ #define _LINUX_THERM_EST_H #include +#include +#include #define HIST_LEN (20) @@ -31,17 +33,18 @@ struct therm_est_subdevice { }; struct therm_est_data { - /* trip point info : there's only 1 trip point */ - char *cdev_type; /* cooling device for this trip */ - long trip_temp; + /* trip point info */ + int num_trips; + struct thermal_trip_info *trips; /* zone parameters */ + struct thermal_zone_params *tzp; long toffset; long polling_period; int passive_delay; - int ndevs; int tc1; int tc2; + int ndevs; struct therm_est_subdevice devs[]; }; -- cgit v1.2.2