From 1afa59d252cda0cda222c9c7a8aa6a1d06306879 Mon Sep 17 00:00:00 2001
From: Rajagopal Venkat <rajagopal.venkat@linaro.org>
Date: Fri, 26 Oct 2012 01:50:18 +0200
Subject: [PATCH] --- yaml --- r: 336768 b: refs/heads/master c:
 206c30cfeb7c05dfb9fdfd81b1deb933627e43c1 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/devfreq/devfreq.c               | 28 +++++++++++++++++++
 trunk/drivers/devfreq/governor.h              |  2 ++
 .../drivers/devfreq/governor_simpleondemand.c |  9 ++++++
 trunk/include/linux/devfreq.h                 | 12 ++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad055474d5f1..a67c45007897 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e6fdd4bad033fa2d73716377b184fa975b0d985
+refs/heads/master: 206c30cfeb7c05dfb9fdfd81b1deb933627e43c1
diff --git a/trunk/drivers/devfreq/devfreq.c b/trunk/drivers/devfreq/devfreq.c
index 1aaf1aeb1f1d..999600da21c7 100644
--- a/trunk/drivers/devfreq/devfreq.c
+++ b/trunk/drivers/devfreq/devfreq.c
@@ -427,6 +427,34 @@ int devfreq_remove_device(struct devfreq *devfreq)
 }
 EXPORT_SYMBOL(devfreq_remove_device);
 
+/**
+ * devfreq_suspend_device() - Suspend devfreq of a device.
+ * @devfreq: the devfreq instance to be suspended
+ */
+int devfreq_suspend_device(struct devfreq *devfreq)
+{
+	if (!devfreq)
+		return -EINVAL;
+
+	return devfreq->governor->event_handler(devfreq,
+				DEVFREQ_GOV_SUSPEND, NULL);
+}
+EXPORT_SYMBOL(devfreq_suspend_device);
+
+/**
+ * devfreq_resume_device() - Resume devfreq of a device.
+ * @devfreq: the devfreq instance to be resumed
+ */
+int devfreq_resume_device(struct devfreq *devfreq)
+{
+	if (!devfreq)
+		return -EINVAL;
+
+	return devfreq->governor->event_handler(devfreq,
+				DEVFREQ_GOV_RESUME, NULL);
+}
+EXPORT_SYMBOL(devfreq_resume_device);
+
 static ssize_t show_governor(struct device *dev,
 			     struct device_attribute *attr, char *buf)
 {
diff --git a/trunk/drivers/devfreq/governor.h b/trunk/drivers/devfreq/governor.h
index bb3aff32d627..26432ac0a398 100644
--- a/trunk/drivers/devfreq/governor.h
+++ b/trunk/drivers/devfreq/governor.h
@@ -22,6 +22,8 @@
 #define DEVFREQ_GOV_START			0x1
 #define DEVFREQ_GOV_STOP			0x2
 #define DEVFREQ_GOV_INTERVAL			0x3
+#define DEVFREQ_GOV_SUSPEND			0x4
+#define DEVFREQ_GOV_RESUME			0x5
 
 /* Caution: devfreq->lock must be locked before calling update_devfreq */
 extern int update_devfreq(struct devfreq *devfreq);
diff --git a/trunk/drivers/devfreq/governor_simpleondemand.c b/trunk/drivers/devfreq/governor_simpleondemand.c
index 3716a659122b..b5cf0fb24efe 100644
--- a/trunk/drivers/devfreq/governor_simpleondemand.c
+++ b/trunk/drivers/devfreq/governor_simpleondemand.c
@@ -104,6 +104,15 @@ static int devfreq_simple_ondemand_handler(struct devfreq *devfreq,
 	case DEVFREQ_GOV_INTERVAL:
 		devfreq_interval_update(devfreq, (unsigned int *)data);
 		break;
+
+	case DEVFREQ_GOV_SUSPEND:
+		devfreq_monitor_suspend(devfreq);
+		break;
+
+	case DEVFREQ_GOV_RESUME:
+		devfreq_monitor_resume(devfreq);
+		break;
+
 	default:
 		break;
 	}
diff --git a/trunk/include/linux/devfreq.h b/trunk/include/linux/devfreq.h
index 9cdffde74bb5..ee243a3229b8 100644
--- a/trunk/include/linux/devfreq.h
+++ b/trunk/include/linux/devfreq.h
@@ -158,6 +158,8 @@ extern struct devfreq *devfreq_add_device(struct device *dev,
 				  const struct devfreq_governor *governor,
 				  void *data);
 extern int devfreq_remove_device(struct devfreq *devfreq);
+extern int devfreq_suspend_device(struct devfreq *devfreq);
+extern int devfreq_resume_device(struct devfreq *devfreq);
 
 /* Helper functions for devfreq user device driver with OPP. */
 extern struct opp *devfreq_recommended_opp(struct device *dev,
@@ -211,6 +213,16 @@ static int devfreq_remove_device(struct devfreq *devfreq)
 	return 0;
 }
 
+static int devfreq_suspend_device(struct devfreq *devfreq)
+{
+	return 0;
+}
+
+static int devfreq_resume_device(struct devfreq *devfreq)
+{
+	return 0;
+}
+
 static struct opp *devfreq_recommended_opp(struct device *dev,
 					   unsigned long *freq, u32 flags)
 {