git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: ICST: merge common ICST VCO structures
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
clock.c
diff --git
a/arch/arm/mach-integrator/clock.c
b/arch/arm/mach-integrator/clock.c
index
989ecf5
..
bb70b64
100644
(file)
--- 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 <linux/clk.h>
#include <linux/mutex.h>
+#include <asm/hardware/icst525.h>
#include <asm/clkdev.h>
#include <mach/clkdev.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)
{
long clk_round_rate(struct clk *clk, unsigned long rate)
{
- struct icst
525
_vco vco;
+ struct icst_vco vco;
vco = icst525_khz_to_vco(clk->params, rate / 1000);
return icst525_khz(clk->params, vco) * 1000;
}
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) {
int ret = -EIO;
if (clk->setvco) {
- struct icst
525
_vco vco;
+ struct icst_vco vco;
vco = icst525_khz_to_vco(clk->params, rate / 1000);
clk->rate = icst525_khz(clk->params, vco) * 1000;
vco = icst525_khz_to_vco(clk->params, rate / 1000);
clk->rate = icst525_khz(clk->params, vco) * 1000;