diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 19:27:28 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 12:35:29 +0400 |
| commit | 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch) | |
| tree | 30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-integrator/clock.c | |
| parent | b830b9b5b3d04bc22f0b9ded85b713f7d3c11b7f (diff) | |
| download | linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mach-integrator/clock.c')
| -rw-r--r-- | arch/arm/mach-integrator/clock.c | 5 |
1 files changed, 3 insertions, 2 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; |