aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-10-03 10:58:57 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-15 18:50:31 -0400
commit200ea8e2c28c1cca4f3faf1e15da78539ecaf835 (patch)
treed7031b653c28a287a2c04bd131b1e5b823234705 /drivers/cpufreq
parent0bcc9d9a3e680ebf7717f1aa8caeee45048ebae3 (diff)
cpufreq: pxa: don't initialize part of policy set by core
Many common initializations of struct policy are moved to core now and hence this driver doesn't need to do it. This patch removes such code. Most recent of those changes is to call ->get() in the core after calling ->init(). Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/pxa2xx-cpufreq.c2
-rw-r--r--drivers/cpufreq/pxa3xx-cpufreq.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c
index 82905fe0041b..29aca574317b 100644
--- a/drivers/cpufreq/pxa2xx-cpufreq.c
+++ b/drivers/cpufreq/pxa2xx-cpufreq.c
@@ -397,8 +397,6 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
397 397
398 /* set default policy and cpuinfo */ 398 /* set default policy and cpuinfo */
399 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ 399 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
400 policy->cur = get_clk_frequency_khz(0); /* current freq */
401 policy->min = policy->max = policy->cur;
402 400
403 /* Generate pxa25x the run cpufreq_frequency_table struct */ 401 /* Generate pxa25x the run cpufreq_frequency_table struct */
404 for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) { 402 for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) {
diff --git a/drivers/cpufreq/pxa3xx-cpufreq.c b/drivers/cpufreq/pxa3xx-cpufreq.c
index ae3ac08a7b23..47fbee49d6e5 100644
--- a/drivers/cpufreq/pxa3xx-cpufreq.c
+++ b/drivers/cpufreq/pxa3xx-cpufreq.c
@@ -201,11 +201,10 @@ static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
201 int ret = -EINVAL; 201 int ret = -EINVAL;
202 202
203 /* set default policy and cpuinfo */ 203 /* set default policy and cpuinfo */
204 policy->cpuinfo.min_freq = 104000; 204 policy->min = policy->cpuinfo.min_freq = 104000;
205 policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000; 205 policy->max = policy->cpuinfo.max_freq =
206 (cpu_is_pxa320()) ? 806000 : 624000;
206 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ 207 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
207 policy->max = pxa3xx_get_clk_frequency_khz(0);
208 policy->cur = policy->min = policy->max;
209 208
210 if (cpu_is_pxa300() || cpu_is_pxa310()) 209 if (cpu_is_pxa300() || cpu_is_pxa310())
211 ret = setup_freqs_table(policy, pxa300_freqs, 210 ret = setup_freqs_table(policy, pxa300_freqs,