1 files changed, 0 insertions, 129 deletions

diff --git a/recipes-kernel/linux/linux-3.0/pm-wip/cpufreq/0012-OMAP2-cpufreq-dont-support-freq_table.patch b/recipes-kernel/linux/linux-3.0/pm-wip/cpufreq/0012-OMAP2-cpufreq-dont-support-freq_table.patch
deleted file mode 100644
index 33ffe54a..00000000
--- a/recipes-kernel/linux/linux-3.0/pm-wip/cpufreq/0012-OMAP2-cpufreq-dont-support-freq_table.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 407f4d9ed824d458406f139a7698c74a1eb3b8f7 Mon Sep 17 00:00:00 2001
-From: Nishanth Menon <nm@ti.com>
-Date: Thu, 26 May 2011 19:39:17 -0700
-Subject: [PATCH 12/19] OMAP2+: cpufreq: dont support !freq_table
-
-OMAP2+ all have frequency tables, hence the hacks we had for older
-silicon do not need to be carried forward. As part of this change,
-use cpufreq_frequency_table_target to find the best match for
-frequency requested.
-
-Signed-off-by: Nishanth Menon <nm@ti.com>
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- arch/arm/mach-omap2/omap2plus-cpufreq.c |   67 +++++++++++++++----------------
- 1 files changed, 33 insertions(+), 34 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c
-index 33a91ec..acf18e8 100644
---- a/arch/arm/mach-omap2/omap2plus-cpufreq.c
-+++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c
-@@ -38,8 +38,6 @@
- 
- #include <mach/hardware.h>
- 
--#define VERY_HI_RATE   900000000
--
- static struct cpufreq_frequency_table *freq_table;
- static struct clk *mpu_clk;
- static char *mpu_clk_name;
-@@ -47,20 +45,9 @@ static struct device *mpu_dev;
- 
- static int omap_verify_speed(struct cpufreq_policy *policy)
- {
--       if (freq_table)
--               return cpufreq_frequency_table_verify(policy, freq_table);
--
--       if (policy->cpu)
-+       if (!freq_table)
-                return -EINVAL;
--
--       cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
--                                    policy->cpuinfo.max_freq);
--
--       policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000;
--       policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000;
--       cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
--                                    policy->cpuinfo.max_freq);
--       return 0;
-+       return cpufreq_frequency_table_verify(policy, freq_table);
- }
- 
- static unsigned int omap_getspeed(unsigned int cpu)
-@@ -78,22 +65,35 @@ static int omap_target(struct cpufreq_policy *policy,
-                       unsigned int target_freq,
-                       unsigned int relation)
- {
--       int i, ret = 0;
-+       unsigned int i;
-+       int ret = 0;
-        struct cpufreq_freqs freqs;
- 
-        /* Changes not allowed until all CPUs are online */
-        if (is_smp() && (num_online_cpus() < NR_CPUS))
-                return ret;
- 
--       /* Ensure desired rate is within allowed range.  Some govenors
--        * (ondemand) will just pass target_freq=0 to get the minimum. */
--       if (target_freq < policy->min)
--               target_freq = policy->min;
--       if (target_freq > policy->max)
--               target_freq = policy->max;
-+       if (!freq_table) {
-+               dev_err(mpu_dev, "%s: cpu%d: no freq table!\n", __func__,
-+                               policy->cpu);
-+               return -EINVAL;
-+       }
-+
-+       ret = cpufreq_frequency_table_target(policy, freq_table, target_freq,
-+                       relation, &i);
-+       if (ret) {
-+               dev_dbg(mpu_dev, "%s: cpu%d: no freq match for %d(ret=%d)\n",
-+                       __func__, policy->cpu, target_freq, ret);
-+               return ret;
-+       }
-+       freqs.new = freq_table[i].frequency;
-+       if (!freqs.new) {
-+               dev_err(mpu_dev, "%s: cpu%d: no match for freq %d\n", __func__,
-+                       policy->cpu, target_freq);
-+               return -EINVAL;
-+       }
- 
-        freqs.old = omap_getspeed(policy->cpu);
--       freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000;
-        freqs.cpu = policy->cpu;
- 
-        if (freqs.old == freqs.new)
-@@ -166,19 +166,18 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
-                return -EINVAL;
- 
-        policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
--       opp_init_cpufreq_table(mpu_dev, &freq_table);
--
--       if (freq_table) {
--               result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
--               if (!result)
--                       cpufreq_frequency_table_get_attr(freq_table,
--                                                       policy->cpu);
--       } else {
--               policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;
--               policy->cpuinfo.max_freq = clk_round_rate(mpu_clk,
--                                                       VERY_HI_RATE) / 1000;
-+       result = opp_init_cpufreq_table(mpu_dev, &freq_table);
-+
-+       if (result) {
-+               dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n",
-+                               __func__, policy->cpu, result);
-+               return result;
-        }
- 
-+       result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
-+       if (!result)
-+               cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
-+
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-        policy->cur = omap_getspeed(policy->cpu);
--- 
-1.7.2.5
-