Merge branch 'pm-cpufreq'

* pm-cpufreq: (167 commits)
  cpufreq: create per policy rwsem instead of per CPU cpu_policy_rwsem
  intel_pstate: Add Baytrail support
  intel_pstate: Refactor driver to support CPUs with different MSR layouts
  cpufreq: Implement light weight ->target_index() routine
  PM / OPP: rename header to linux/pm_opp.h
  PM / OPP: rename data structures to dev_pm equivalents
  PM / OPP: rename functions to dev_pm_opp*
  cpufreq / governor: Remove fossil comment
  cpufreq: exynos4210: Use the common clock framework to set APLL clock rate
  cpufreq: exynos4x12: Use the common clock framework to set APLL clock rate
  cpufreq: Detect spurious invocations of update_policy_cpu()
  cpufreq: pmac64: enable cpufreq on iMac G5 (iSight) model
  cpufreq: pmac64: provide cpufreq transition latency for older G5 models
  cpufreq: pmac64: speed up frequency switch
  cpufreq: highbank-cpufreq: Enable Midway/ECX-2000
  exynos-cpufreq: fix false return check from "regulator_set_voltage"
  speedstep-centrino: Remove unnecessary braces
  acpi-cpufreq: Add comment under ACPI_ADR_SPACE_SYSTEM_IO case
  cpufreq: arm-big-little: use clk_get instead of clk_get_sys
  cpufreq: exynos: Show a list of available frequencies
  ...

Conflicts:
	drivers/devfreq/exynos/exynos5_bus.c

3 files changed, 41 insertions, 39 deletions

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index c99c00d35d34..2e23b12c350b 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -18,7 +18,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
-#include <linux/opp.h>
+#include <linux/pm_opp.h>
 #include <linux/devfreq.h>
 #include <linux/workqueue.h>
 #include <linux/platform_device.h>
@@ -902,13 +902,13 @@ static ssize_t available_frequencies_show(struct device *d,
 {
         struct devfreq *df = to_devfreq(d);
         struct device *dev = df->dev.parent;
-        struct opp *opp;
+        struct dev_pm_opp *opp;
         ssize_t count = 0;
         unsigned long freq = 0;
 
         rcu_read_lock();
         do {
-                opp = opp_find_freq_ceil(dev, &freq);
+                opp = dev_pm_opp_find_freq_ceil(dev, &freq);
                 if (IS_ERR(opp))
                         break;
 
@@ -1029,25 +1029,26 @@ module_exit(devfreq_exit);
  * under the locked area. The pointer returned must be used prior to unlocking
  * with rcu_read_unlock() to maintain the integrity of the pointer.
  */
-struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq,
-                                    u32 flags)
+struct dev_pm_opp *devfreq_recommended_opp(struct device *dev,
+                                           unsigned long *freq,
+                                           u32 flags)
 {
-        struct opp *opp;
+        struct dev_pm_opp *opp;
 
         if (flags & DEVFREQ_FLAG_LEAST_UPPER_BOUND) {
                 /* The freq is an upper bound. opp should be lower */
-                opp = opp_find_freq_floor(dev, freq);
+                opp = dev_pm_opp_find_freq_floor(dev, freq);
 
                 /* If not available, use the closest opp */
                 if (opp == ERR_PTR(-ERANGE))
-                        opp = opp_find_freq_ceil(dev, freq);
+                        opp = dev_pm_opp_find_freq_ceil(dev, freq);
         } else {
                 /* The freq is an lower bound. opp should be higher */
-                opp = opp_find_freq_ceil(dev, freq);
+                opp = dev_pm_opp_find_freq_ceil(dev, freq);
 
                 /* If not available, use the closest opp */
                 if (opp == ERR_PTR(-ERANGE))
-                        opp = opp_find_freq_floor(dev, freq);
+                        opp = dev_pm_opp_find_freq_floor(dev, freq);
         }
 
         return opp;
@@ -1066,7 +1067,7 @@ int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq)
         int ret = 0;
 
         rcu_read_lock();
-        nh = opp_get_notifier(dev);
+        nh = dev_pm_opp_get_notifier(dev);
         if (IS_ERR(nh))
                 ret = PTR_ERR(nh);
         rcu_read_unlock();
@@ -1092,7 +1093,7 @@ int devfreq_unregister_opp_notifier(struct device *dev, struct devfreq *devfreq)
         int ret = 0;
 
         rcu_read_lock();
-        nh = opp_get_notifier(dev);
+        nh = dev_pm_opp_get_notifier(dev);
         if (IS_ERR(nh))
                 ret = PTR_ERR(nh);
         rcu_read_unlock();
diff --git a/drivers/devfreq/exynos/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c
index c5f86d8caca3..cede6f71cd63 100644
--- a/drivers/devfreq/exynos/exynos4_bus.c
+++ b/drivers/devfreq/exynos/exynos4_bus.c
@@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/suspend.h>
-#include <linux/opp.h>
+#include <linux/pm_opp.h>
 #include <linux/devfreq.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
@@ -639,7 +639,7 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq,
         struct platform_device *pdev = container_of(dev, struct platform_device,
                                                     dev);
         struct busfreq_data *data = platform_get_drvdata(pdev);
-        struct opp *opp;
+        struct dev_pm_opp *opp;
         unsigned long freq;
         unsigned long old_freq = data->curr_oppinfo.rate;
         struct busfreq_opp_info new_oppinfo;
@@ -650,8 +650,8 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq,
                 rcu_read_unlock();
                 return PTR_ERR(opp);
         }
-        new_oppinfo.rate = opp_get_freq(opp);
-        new_oppinfo.volt = opp_get_voltage(opp);
+        new_oppinfo.rate = dev_pm_opp_get_freq(opp);
+        new_oppinfo.volt = dev_pm_opp_get_voltage(opp);
         rcu_read_unlock();
         freq = new_oppinfo.rate;
 
@@ -873,7 +873,7 @@ static int exynos4210_init_tables(struct busfreq_data *data)
                 exynos4210_busclk_table[i].volt = exynos4210_asv_volt[mgrp][i];
 
         for (i = LV_0; i < EX4210_LV_NUM; i++) {
-                err = opp_add(data->dev, exynos4210_busclk_table[i].clk,
+                err = dev_pm_opp_add(data->dev, exynos4210_busclk_table[i].clk,
                               exynos4210_busclk_table[i].volt);
                 if (err) {
                         dev_err(data->dev, "Cannot add opp entries.\n");
@@ -940,7 +940,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data)
         }
 
         for (i = 0; i < EX4x12_LV_NUM; i++) {
-                ret = opp_add(data->dev, exynos4x12_mifclk_table[i].clk,
+                ret = dev_pm_opp_add(data->dev, exynos4x12_mifclk_table[i].clk,
                               exynos4x12_mifclk_table[i].volt);
                 if (ret) {
                         dev_err(data->dev, "Fail to add opp entries.\n");
@@ -956,7 +956,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this,
 {
         struct busfreq_data *data = container_of(this, struct busfreq_data,
                                                  pm_notifier);
-        struct opp *opp;
+        struct dev_pm_opp *opp;
         struct busfreq_opp_info new_oppinfo;
         unsigned long maxfreq = ULONG_MAX;
         int err = 0;
@@ -969,7 +969,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this,
                 data->disabled = true;
 
                 rcu_read_lock();
-                opp = opp_find_freq_floor(data->dev, &maxfreq);
+                opp = dev_pm_opp_find_freq_floor(data->dev, &maxfreq);
                 if (IS_ERR(opp)) {