diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 15:16:10 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:33 -0400 |
commit | c5a0adb51002e51a4254cb7f0ab7190d41d8b930 (patch) | |
tree | b6ae6bd13b1aa722e7d96876da28cd5ac3722188 /arch/arm/mach-integrator/cpu.c | |
parent | 232eaf7f268f765b52170bec42bfa0c5825aa239 (diff) |
ARM: ICST: kill duplicate icst code
The only difference between ICST307 and ICST525 are the two arrays
for calculating the S parameter; the code is now identical. Merge
the two files and kill the duplicated code.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/cpu.c')
-rw-r--r-- | arch/arm/mach-integrator/cpu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index 9481c5408bf8..1cb222daa06d 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <mach/platform.h> | 23 | #include <mach/platform.h> |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | #include <asm/hardware/icst525.h> | 25 | #include <asm/hardware/icst.h> |
26 | 26 | ||
27 | static struct cpufreq_driver integrator_driver; | 27 | static struct cpufreq_driver integrator_driver; |
28 | 28 | ||
@@ -66,11 +66,11 @@ static int integrator_verify_policy(struct cpufreq_policy *policy) | |||
66 | policy->cpuinfo.min_freq, | 66 | policy->cpuinfo.min_freq, |
67 | policy->cpuinfo.max_freq); | 67 | policy->cpuinfo.max_freq); |
68 | 68 | ||
69 | vco = icst525_hz_to_vco(&cclk_params, policy->max * 1000); | 69 | vco = icst_hz_to_vco(&cclk_params, policy->max * 1000); |
70 | policy->max = icst525_hz(&cclk_params, vco) / 1000; | 70 | policy->max = icst_hz(&cclk_params, vco) / 1000; |
71 | 71 | ||
72 | vco = icst525_hz_to_vco(&cclk_params, policy->min * 1000); | 72 | vco = icst_hz_to_vco(&cclk_params, policy->min * 1000); |
73 | policy->min = icst525_hz(&cclk_params, vco) / 1000; | 73 | policy->min = icst_hz(&cclk_params, vco) / 1000; |
74 | 74 | ||
75 | cpufreq_verify_within_limits(policy, | 75 | cpufreq_verify_within_limits(policy, |
76 | policy->cpuinfo.min_freq, | 76 | policy->cpuinfo.min_freq, |
@@ -112,17 +112,17 @@ static int integrator_set_target(struct cpufreq_policy *policy, | |||
112 | } | 112 | } |
113 | vco.v = cm_osc & 255; | 113 | vco.v = cm_osc & 255; |
114 | vco.r = 22; | 114 | vco.r = 22; |
115 | freqs.old = icst525_hz(&cclk_params, vco) / 1000; | 115 | freqs.old = icst_hz(&cclk_params, vco) / 1000; |
116 | 116 | ||
117 | /* icst525_hz_to_vco rounds down -- so we need the next | 117 | /* icst_hz_to_vco rounds down -- so we need the next |
118 | * larger freq in case of CPUFREQ_RELATION_L. | 118 | * larger freq in case of CPUFREQ_RELATION_L. |
119 | */ | 119 | */ |
120 | if (relation == CPUFREQ_RELATION_L) | 120 | if (relation == CPUFREQ_RELATION_L) |
121 | target_freq += 999; | 121 | target_freq += 999; |
122 | if (target_freq > policy->max) | 122 | if (target_freq > policy->max) |
123 | target_freq = policy->max; | 123 | target_freq = policy->max; |
124 | vco = icst525_hz_to_vco(&cclk_params, target_freq * 1000); | 124 | vco = icst_hz_to_vco(&cclk_params, target_freq * 1000); |
125 | freqs.new = icst525_hz(&cclk_params, vco) / 1000; | 125 | freqs.new = icst_hz(&cclk_params, vco) / 1000; |
126 | 126 | ||
127 | freqs.cpu = policy->cpu; | 127 | freqs.cpu = policy->cpu; |
128 | 128 | ||
@@ -180,7 +180,7 @@ static unsigned int integrator_get(unsigned int cpu) | |||
180 | vco.v = cm_osc & 255; | 180 | vco.v = cm_osc & 255; |
181 | vco.r = 22; | 181 | vco.r = 22; |
182 | 182 | ||
183 | current_freq = icst525_hz(&cclk_params, vco) / 1000; /* current freq */ | 183 | current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */ |
184 | 184 | ||
185 | set_cpus_allowed(current, cpus_allowed); | 185 | set_cpus_allowed(current, cpus_allowed); |
186 | 186 | ||