[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit 69b0f5da26b44d352ff11d3e832f3ee277bb3343
Author: Werner Almesberger <werner at openmoko.org>
Date:   Mon Mar 9 21:02:33 2009 +0000

    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 at openmoko.org>

diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 031c704..b6b9de5 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;

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko