Merge branch 'pm-devfreq'

* pm-devfreq: (23 commits)
  PM / devfreq: remove compiler error with module governors (2)
  PM / devfreq: Fix return value in devfreq_remove_governor()
  PM / devfreq: Fix incorrect argument in error message
  PM / devfreq: missing rcu_read_lock() added for find_device_opp()
  PM / devfreq: remove compiler error when a governor is module
  PM / devfreq: exynos4_bus.c: Fixed an alignment of the func call args.
  PM / devfreq: Add sysfs node to expose available governors
  PM / devfreq: allow sysfs governor node to switch governor
  PM / devfreq: governors: add GPL module license and allow module build
  PM / devfreq: map devfreq drivers to governor using name
  PM / devfreq: register governors with devfreq framework
  PM / devfreq: provide hooks for governors to be registered
  PM / devfreq: export update_devfreq
  PM / devfreq: Add sysfs node for representing frequency transition information.
  PM / devfreq: Add sysfs node to expose available frequencies
  PM / devfreq: documentation cleanups for devfreq header
  PM / devfreq: Use devm_* functions in exynos4_bus.c
  PM / devfreq: make devfreq_class static
  PM / devfreq: fix sscanf handling for writable sysfs entries
  PM / devfreq: kernel-doc typo corrections
  ...

10 files changed, 942 insertions, 401 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-devfreq b/Documentation/ABI/testing/sysfs-class-devfreq
index 23d78b5aab11..0ba6ea2f89d9 100644
--- a/Documentation/ABI/testing/sysfs-class-devfreq
+++ b/Documentation/ABI/testing/sysfs-class-devfreq
@@ -11,7 +11,7 @@ What:		/sys/class/devfreq/.../governor
 Date:           September 2011
 Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-                The /sys/class/devfreq/.../governor shows the name of the
+                The /sys/class/devfreq/.../governor show or set the name of the
                 governor used by the corresponding devfreq object.
 
 What:           /sys/class/devfreq/.../cur_freq
@@ -19,15 +19,16 @@ Date:		September 2011
 Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
                 The /sys/class/devfreq/.../cur_freq shows the current
-                frequency of the corresponding devfreq object.
+                frequency of the corresponding devfreq object. Same as
+                target_freq when get_cur_freq() is not implemented by
+                devfreq driver.
 
-What:           /sys/class/devfreq/.../central_polling
-Date:           September 2011
-Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
+What:           /sys/class/devfreq/.../target_freq
+Date:           September 2012
+Contact:        Rajagopal Venkat <rajagopal.venkat@linaro.org>
 Description:
-                The /sys/class/devfreq/.../central_polling shows whether
-                the devfreq ojbect is using devfreq-provided central
-                polling mechanism or not.
+                The /sys/class/devfreq/.../target_freq shows the next governor
+                predicted target frequency of the corresponding devfreq object.
 
 What:           /sys/class/devfreq/.../polling_interval
 Date:           September 2011
@@ -43,6 +44,17 @@ Description:
                 (/sys/class/devfreq/.../central_polling is 0), this value
                 may be useless.
 
+What:           /sys/class/devfreq/.../trans_stat
+Date:           October 2012
+Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
+Descrtiption:
+                This ABI shows the statistics of devfreq behavior on a
+                specific device. It shows the time spent in each state and
+                the number of transitions between states.
+                In order to activate this ABI, the devfreq target device
+                driver should provide the list of available frequencies
+                with its profile.
+
 What:           /sys/class/devfreq/.../userspace/set_freq
 Date:           September 2011
 Contact:        MyungJoo Ham <myungjoo.ham@samsung.com>
@@ -50,3 +62,19 @@ Description:
                 The /sys/class/devfreq/.../userspace/set_freq shows and
                 sets the requested frequency for the devfreq object if
                 userspace governor is in effect.
+
+What:           /sys/class/devfreq/.../available_frequencies
+Date:           October 2012
+Contact:        Nishanth Menon <nm@ti.com>
+Description:
+                The /sys/class/devfreq/.../available_frequencies shows
+                the available frequencies of the corresponding devfreq object.
+                This is a snapshot of available frequencies and not limited
+                by the min/max frequency restrictions.
+
+What:           /sys/class/devfreq/.../available_governors
+Date:           October 2012
+Contact:        Nishanth Menon <nm@ti.com>
+Description:
+                The /sys/class/devfreq/.../available_governors shows
+                currently available governors in the system.
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
index f6b0a6e2ea50..0f079be13305 100644
--- a/drivers/devfreq/Kconfig
+++ b/drivers/devfreq/Kconfig
@@ -30,7 +30,7 @@ if PM_DEVFREQ
 comment "DEVFREQ Governors"
 
 config DEVFREQ_GOV_SIMPLE_ONDEMAND
-        bool "Simple Ondemand"
+        tristate "Simple Ondemand"
         help
           Chooses frequency based on the recent load on the device. Works
           similar as ONDEMAND governor of CPUFREQ does. A device with
@@ -39,7 +39,7 @@ config DEVFREQ_GOV_SIMPLE_ONDEMAND
           values to the governor with data field at devfreq_add_device().
 
 config DEVFREQ_GOV_PERFORMANCE
-        bool "Performance"
+        tristate "Performance"
         help
           Sets the frequency at the maximum available frequency.
           This governor always returns UINT_MAX as frequency so that
@@ -47,7 +47,7 @@ config DEVFREQ_GOV_PERFORMANCE
           at any time.
 
 config DEVFREQ_GOV_POWERSAVE
-        bool "Powersave"
+        tristate "Powersave"
         help
           Sets the frequency at the minimum available frequency.
           This governor always returns 0 as frequency so that
@@ -55,7 +55,7 @@ config DEVFREQ_GOV_POWERSAVE
           at any time.
 
 config DEVFREQ_GOV_USERSPACE
-        bool "Userspace"
+        tristate "Userspace"
         help
           Sets the frequency at the user specified one.
           This governor returns the user configured frequency if there
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 4fa1a22c55ea..53766f39aadd 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -27,21 +27,17 @@
 #include <linux/hrtimer.h>
 #include "governor.h"
 
-struct class *devfreq_class;
+static struct class *devfreq_class;
 
 /*
- * devfreq_work periodically monitors every registered device.
- * The minimum polling interval is one jiffy. The polling interval is
- * determined by the minimum polling period among all polling devfreq
- * devices. The resolution of polling interval is one jiffy.
+ * devfreq core provides delayed work based load monitoring helper
+ * functions. Governors can use these or can implement their own
+ * monitoring mechanism.
  */
-static bool polling;
 static struct workqueue_struct *devfreq_wq;
-static struct delayed_work devfreq_work;
-
-/* wait removing if this is to be removed */
-static struct devfreq *wait_remove_device;
 
+/* The list of all device-devfreq governors */
+static LIST_HEAD(devfreq_governor_list);
 /* The list of all device-devfreq */
 static LIST_HEAD(devfreq_list);
 static DEFINE_MUTEX(devfreq_list_lock);
@@ -73,6 +69,79 @@ static struct devfreq *find_device_devfreq(struct device *dev)
 }