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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
clock-sh7372.c
diff --git
a/arch/arm/mach-shmobile/clock-sh7372.c
b/arch/arm/mach-shmobile/clock-sh7372.c
index
9aa8d68
..
e9731b5
100644
(file)
--- a/
arch/arm/mach-shmobile/clock-sh7372.c
+++ b/
arch/arm/mach-shmobile/clock-sh7372.c
@@
-234,7
+234,9
@@
static int pllc2_set_rate(struct clk *clk, unsigned long rate)
value = __raw_readl(PLLC2CR) & ~(0x3f << 24);
- __raw_writel((value & ~0x80000000) | ((idx + 19) << 24), PLLC2CR);
+ __raw_writel(value | ((idx + 19) << 24), PLLC2CR);
+
+ clk->rate = clk->freq_table[idx].frequency;
return 0;
}