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>
diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c
index a4f80d3..52fc294 100644
--- a/arch/arm/mach-integrator/clock.c
+++ b/arch/arm/mach-integrator/clock.c
@@ -14,7 +14,7 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>
@@ -38,8 +38,8 @@
long clk_round_rate(struct clk *clk, unsigned long rate)
{
struct icst_vco vco;
- vco = icst525_hz_to_vco(clk->params, rate);
- return icst525_hz(clk->params, vco);
+ vco = icst_hz_to_vco(clk->params, rate);
+ return icst_hz(clk->params, vco);
}
EXPORT_SYMBOL(clk_round_rate);
@@ -50,8 +50,8 @@
if (clk->setvco) {
struct icst_vco vco;
- vco = icst525_hz_to_vco(clk->params, rate);
- clk->rate = icst525_hz(clk->params, vco);
+ vco = icst_hz_to_vco(clk->params, rate);
+ clk->rate = icst_hz(clk->params, vco);
clk->setvco(clk, vco);
ret = 0;
}
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 9481c54..1cb222d 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -22,7 +22,7 @@
#include <mach/hardware.h>
#include <mach/platform.h>
#include <asm/mach-types.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
static struct cpufreq_driver integrator_driver;
@@ -66,11 +66,11 @@
policy->cpuinfo.min_freq,
policy->cpuinfo.max_freq);
- vco = icst525_hz_to_vco(&cclk_params, policy->max * 1000);
- policy->max = icst525_hz(&cclk_params, vco) / 1000;
+ vco = icst_hz_to_vco(&cclk_params, policy->max * 1000);
+ policy->max = icst_hz(&cclk_params, vco) / 1000;
- vco = icst525_hz_to_vco(&cclk_params, policy->min * 1000);
- policy->min = icst525_hz(&cclk_params, vco) / 1000;
+ vco = icst_hz_to_vco(&cclk_params, policy->min * 1000);
+ policy->min = icst_hz(&cclk_params, vco) / 1000;
cpufreq_verify_within_limits(policy,
policy->cpuinfo.min_freq,
@@ -112,17 +112,17 @@
}
vco.v = cm_osc & 255;
vco.r = 22;
- freqs.old = icst525_hz(&cclk_params, vco) / 1000;
+ freqs.old = icst_hz(&cclk_params, vco) / 1000;
- /* icst525_hz_to_vco rounds down -- so we need the next
+ /* icst_hz_to_vco rounds down -- so we need the next
* larger freq in case of CPUFREQ_RELATION_L.
*/
if (relation == CPUFREQ_RELATION_L)
target_freq += 999;
if (target_freq > policy->max)
target_freq = policy->max;
- vco = icst525_hz_to_vco(&cclk_params, target_freq * 1000);
- freqs.new = icst525_hz(&cclk_params, vco) / 1000;
+ vco = icst_hz_to_vco(&cclk_params, target_freq * 1000);
+ freqs.new = icst_hz(&cclk_params, vco) / 1000;
freqs.cpu = policy->cpu;
@@ -180,7 +180,7 @@
vco.v = cm_osc & 255;
vco.r = 22;
- current_freq = icst525_hz(&cclk_params, vco) / 1000; /* current freq */
+ current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */
set_cpus_allowed(current, cpus_allowed);
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index e24cfc3..3e21102 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -24,7 +24,7 @@
#include <asm/clkdev.h>
#include <mach/clkdev.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
#include <mach/lm.h>
#include <mach/impd1.h>
#include <asm/sizes.h>
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9997d1f..a9ab8fd 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -29,7 +29,7 @@
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
#include <mach/cm.h>
#include <mach/lm.h>