From 9ae40af84a69bc5a78ea2955bcc1a5f802b2d564 Mon Sep 17 00:00:00 2001
From: Durgadoss R <durgadoss.r@intel.com>
Date: Tue, 18 Sep 2012 11:05:05 +0530
Subject: [PATCH] --- yaml --- r: 339269 b: refs/heads/master c:
 f2b4caafd4aa64c9438b0a94af78b127228e6905 h: refs/heads/master i:   339267:
 74692298e92b00593b724e910f0a9a62c2423a0a v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/thermal/thermal_sys.c | 18 ++++++++++++++++++
 trunk/include/linux/thermal.h       |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 407b939bdea7..ceaa10914dbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c01ebbfd3caf1dc132e0d93c8e7e9f742839d94
+refs/heads/master: f2b4caafd4aa64c9438b0a94af78b127228e6905
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c
index 64f3e9735316..a69f24c4414a 100644
--- a/trunk/drivers/thermal/thermal_sys.c
+++ b/trunk/drivers/thermal/thermal_sys.c
@@ -1368,6 +1368,24 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev)
 }
 EXPORT_SYMBOL(thermal_cdev_update);
 
+/**
+ * notify_thermal_framework - Sensor drivers use this API to notify framework
+ * @tz:		thermal zone device
+ * @trip:	indicates which trip point has been crossed
+ *
+ * This function handles the trip events from sensor drivers. It starts
+ * throttling the cooling devices according to the policy configured.
+ * For CRITICAL and HOT trip points, this notifies the respective drivers,
+ * and does actual throttling for other trip points i.e ACTIVE and PASSIVE.
+ * The throttling policy is based on the configured platform data; if no
+ * platform data is provided, this uses the step_wise throttling policy.
+ */
+void notify_thermal_framework(struct thermal_zone_device *tz, int trip)
+{
+	handle_thermal_trip(tz, trip);
+}
+EXPORT_SYMBOL(notify_thermal_framework);
+
 /**
  * create_trip_attrs - create attributes for trip points
  * @tz:		the thermal zone device
diff --git a/trunk/include/linux/thermal.h b/trunk/include/linux/thermal.h
index 2bd915841818..807f2146fe35 100644
--- a/trunk/include/linux/thermal.h
+++ b/trunk/include/linux/thermal.h
@@ -232,6 +232,7 @@ int get_tz_trend(struct thermal_zone_device *, int);
 struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
 		struct thermal_cooling_device *, int);
 void thermal_cdev_update(struct thermal_cooling_device *);
+void notify_thermal_framework(struct thermal_zone_device *, int);
 
 int thermal_register_governor(struct thermal_governor *);
 void thermal_unregister_governor(struct thermal_governor *);