ARM: ICST: merge common ICST VCO structures

The structures for the ICST307 and ICST525 VCO devices are
identical, so merge them together.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

5 files changed, 15 insertions, 14 deletions

diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c
index 989ecf5f5c46..bb70b64a6563 100644
--- a/arch/arm/mach-integrator/clock.c
+++ b/arch/arm/mach-integrator/clock.c
@@ -14,6 +14,7 @@
 #include <linux/clk.h>
 #include <linux/mutex.h>
 
+#include <asm/hardware/icst525.h>
 #include <asm/clkdev.h>
 #include <mach/clkdev.h>
 
@@ -36,7 +37,7 @@ EXPORT_SYMBOL(clk_get_rate);
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
-        struct icst525_vco vco;
+        struct icst_vco vco;
         vco = icst525_khz_to_vco(clk->params, rate / 1000);
         return icst525_khz(clk->params, vco) * 1000;
 }
@@ -47,7 +48,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
         int ret = -EIO;
 
         if (clk->setvco) {
-                struct icst525_vco vco;
+                struct icst_vco vco;
 
                 vco = icst525_khz_to_vco(clk->params, rate / 1000);
                 clk->rate = icst525_khz(clk->params, vco) * 1000;
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 7f1b73b776a7..c4e5debeb48c 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -31,7 +31,7 @@ static struct cpufreq_driver integrator_driver;
 #define CM_STAT IO_ADDRESS(INTEGRATOR_HDR_STAT)
 #define CM_LOCK IO_ADDRESS(INTEGRATOR_HDR_LOCK)
 
-static const struct icst525_params lclk_params = {
+static const struct icst_params lclk_params = {
         .ref            = 24000,
         .vco_max        = 320000,
         .vd_min         = 8,
@@ -40,7 +40,7 @@ static const struct icst525_params lclk_params = {
         .rd_max         = 24,
 };
 
-static const struct icst525_params cclk_params = {
+static const struct icst_params cclk_params = {
         .ref            = 24000,
         .vco_max        = 320000,
         .vd_min         = 12,
@@ -54,7 +54,7 @@ static const struct icst525_params cclk_params = {
  */
 static int integrator_verify_policy(struct cpufreq_policy *policy)
 {
-        struct icst525_vco vco;
+        struct icst_vco vco;
 
         cpufreq_verify_within_limits(policy, 
                                      policy->cpuinfo.min_freq, 
@@ -80,7 +80,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
 {
         cpumask_t cpus_allowed;
         int cpu = policy->cpu;
-        struct icst525_vco vco;
+        struct icst_vco vco;
         struct cpufreq_freqs freqs;
         u_int cm_osc;
 
@@ -156,7 +156,7 @@ static unsigned int integrator_get(unsigned int cpu)
         cpumask_t cpus_allowed;
         unsigned int current_freq;
         u_int cm_osc;
-        struct icst525_vco vco;
+        struct icst_vco vco;
 
         cpus_allowed = current->cpus_allowed;
 
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 0058c937719e..dfb961b67afa 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -40,7 +40,7 @@ struct impd1_module {
         struct clk_lookup *clks[3];
 };
 
-static const struct icst525_params impd1_vco_params = {
+static const struct icst_params impd1_vco_params = {
         .ref            = 24000,        /* 24 MHz */
         .vco_max        = 200000,       /* 200 MHz */
         .vd_min         = 12,
@@ -49,7 +49,7 @@ static const struct icst525_params impd1_vco_params = {
         .rd_max         = 120,
 };
 
-static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
+static void impd1_setvco(struct clk *clk, struct icst_vco vco)
 {
         struct impd1_module *impd1 = clk->data;
         int vconr = clk - impd1->vcos;
diff --git a/arch/arm/mach-integrator/include/mach/clkdev.h b/arch/arm/mach-integrator/include/mach/clkdev.h
index 9293e410832a..89ea93803998 100644
--- a/arch/arm/mach-integrator/include/mach/clkdev.h
+++ b/arch/arm/mach-integrator/include/mach/clkdev.h
@@ -2,14 +2,14 @@
 #define __ASM_MACH_CLKDEV_H
 
 #include <linux/module.h>
-#include <asm/hardware/icst525.h>
+#include <asm/hardware/icst.h>
 
 struct clk {
         unsigned long           rate;
         struct module           *owner;
-        const struct icst525_params *params;
+        const struct icst_params *params;
         void                    *data;
-        void                    (*setvco)(struct clk *, struct icst525_vco vco);
+        void                    (*setvco)(struct clk *, struct icst_vco vco);
 };
 
 static inline int __clk_get(struct clk *clk)
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index c0161df9d9a2..15bfbe2e1df8 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -268,7 +268,7 @@ static void __init intcp_init_irq(void)
 #define CM_LOCK IO_ADDRESS(INTEGRATOR_HDR_LOCK)
 #define CM_AUXOSC IO_ADDRESS(INTEGRATOR_HDR_BASE + 0x1c)
 
-static const struct icst525_params cp_auxvco_params = {
+static const struct icst_params cp_auxvco_params = {
         .ref            = 24000,
         .vco_max        = 320000,
         .vd_min         = 8,
@@ -277,7 +277,7 @@ static const struct icst525_params cp_auxvco_params = {
         .rd_max         = 65,
 };
 
-static void cp_auxvco_set(struct clk *clk, struct icst525_vco vco)
+static void cp_auxvco_set(struct clk *clk, struct icst_vco vco)
 {
         u32 val;