ARM: Indirect round/set_rate operations through clk structure

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

2 files changed, 9 insertions, 3 deletions

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 957bbde83d3..60baba65635 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -381,9 +381,15 @@ static void versatile_oscvco_set(struct clk *clk, struct icst_vco vco)
         writel(0, sys_lock);
 }
 
+static const struct clk_ops osc4_clk_ops = {
+        .round  = icst_clk_round,
+        .set    = icst_clk_set,
+        .setvco = versatile_oscvco_set,
+};
+
 static struct clk osc4_clk = {
+        .ops    = &osc4_clk_ops,
         .params = &versatile_oscvco_params,
-        .setvco = versatile_oscvco_set,
 };
 
 /*
diff --git a/arch/arm/mach-versatile/include/mach/clkdev.h b/arch/arm/mach-versatile/include/mach/clkdev.h
index baea03c9ad4..e58d0771b64 100644
--- a/arch/arm/mach-versatile/include/mach/clkdev.h
+++ b/arch/arm/mach-versatile/include/mach/clkdev.h
@@ -1,13 +1,13 @@
 #ifndef __ASM_MACH_CLKDEV_H
 #define __ASM_MACH_CLKDEV_H
 
-#include <asm/hardware/icst.h>
+#include <plat/clock.h>
 
 struct clk {
         unsigned long           rate;
+        const struct clk_ops    *ops;
         const struct icst_params *params;
         void __iomem            *vcoreg;
-        void                    (*setvco)(struct clk *, struct icst_vco vco);
 };
 
 #define __clk_get(clk) ({ 1; })