aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorWerner Almesberger <werner@openmoko.org>2009-03-09 21:02:33 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-09 21:02:33 +0000
commit69b0f5da26b44d352ff11d3e832f3ee277bb3343 (patch)
tree1f73f136dc5dc1d803ef047212cb2173d6614b2f /arch/arm
parent63ca6e59552380186aeb75d9440147fe0f7601b4 (diff)
Fix clock shift in s3c64xx_setrate_clksrc
s3c64xx_setrate_clksrc used the clock selection shift sclk->shift instead of the divider shift sclk->divider_shift, causing clocks to be clobbered. Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 031c704f217..b6b9de5d708 100644
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
@@ -318,8 +318,8 @@ static int s3c64xx_setrate_clksrc(struct clk *clk, unsigned long rate)
return -EINVAL;
val = __raw_readl(reg);
- val &= ~(0xf << sclk->shift);
- val |= (div - 1) << sclk->shift;
+ val &= ~(0xf << sclk->divider_shift);
+ val |= (div - 1) << sclk->divider_shift;
__raw_writel(val, reg);
return 0;