aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-integrator/cpu.c1
-rw-r--r--arch/arm/mach-pxa/cpufreq-pxa2xx.c3
-rw-r--r--arch/arm/mach-pxa/cpufreq-pxa3xx.c1
-rw-r--r--arch/arm/mach-sa1100/cpu-sa1100.c1
4 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index e4f72d202cc0..44d4c2e8207b 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -184,7 +184,6 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy)
184{ 184{
185 185
186 /* set default policy and cpuinfo */ 186 /* set default policy and cpuinfo */
187 policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
188 policy->cpuinfo.max_freq = 160000; 187 policy->cpuinfo.max_freq = 160000;
189 policy->cpuinfo.min_freq = 12000; 188 policy->cpuinfo.min_freq = 12000;
190 policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */ 189 policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
index d82528e74bd0..1f272ea83f36 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
@@ -335,9 +335,6 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)
335 pxa27x_guess_max_freq(); 335 pxa27x_guess_max_freq();
336 336
337 /* set default policy and cpuinfo */ 337 /* set default policy and cpuinfo */
338 policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
339 if (cpu_is_pxa25x())
340 policy->policy = CPUFREQ_POLICY_PERFORMANCE;
341 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ 338 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
342 policy->cur = get_clk_frequency_khz(0); /* current freq */ 339 policy->cur = get_clk_frequency_khz(0); /* current freq */
343 policy->min = policy->max = policy->cur; 340 policy->min = policy->max = policy->cur;
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
index 1ea0c9c0adaf..968c8309ec37 100644
--- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
@@ -210,7 +210,6 @@ static __init int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
210 int ret = -EINVAL; 210 int ret = -EINVAL;
211 211
212 /* set default policy and cpuinfo */ 212 /* set default policy and cpuinfo */
213 policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
214 policy->cpuinfo.min_freq = 104000; 213 policy->cpuinfo.min_freq = 104000;
215 policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000; 214 policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000;
216 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ 215 policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
index f7fa03478efd..244d5956312c 100644
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/arch/arm/mach-sa1100/cpu-sa1100.c
@@ -224,7 +224,6 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
224 if (policy->cpu != 0) 224 if (policy->cpu != 0)
225 return -EINVAL; 225 return -EINVAL;
226 policy->cur = policy->min = policy->max = sa11x0_getspeed(0); 226 policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
227 policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
228 policy->cpuinfo.min_freq = 59000; 227 policy->cpuinfo.min_freq = 59000;
229 policy->cpuinfo.max_freq = 287000; 228 policy->cpuinfo.max_freq = 287000;
230 policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; 229 policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;