diff options
-rw-r--r-- | drivers/cpufreq/pxa2xx-cpufreq.c | 2 | ||||
-rw-r--r-- | drivers/cpufreq/pxa3xx-cpufreq.c | 7 |
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, |