diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-10 23:40:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-10 23:40:50 +0200 |
| commit | dcbf77cac640af0ab944d5cbb07934bf6708b4d9 (patch) | |
| tree | e2f4d1b3a1089ee10436cb19740a9cb99f2dc527 /arch/arm/plat-s3c64xx/s3c6400-clock.c | |
| parent | c00aafcd4977769e8728292302ddbbb8b1082fab (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
| download | kernel_samsung_smdk4412-dcbf77cac640af0ab944d5cbb07934bf6708b4d9.tar.gz kernel_samsung_smdk4412-dcbf77cac640af0ab944d5cbb07934bf6708b4d9.tar.bz2 kernel_samsung_smdk4412-dcbf77cac640af0ab944d5cbb07934bf6708b4d9.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/plat-s3c64xx/s3c6400-clock.c')
| -rw-r--r-- | arch/arm/plat-s3c64xx/s3c6400-clock.c | 4 |
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 1debc1f9f98..febac1950d8 100644 --- a/arch/arm/plat-s3c64xx/s3c6400-clock.c +++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c @@ -153,7 +153,7 @@ static unsigned long s3c64xx_clk_arm_round_rate(struct clk *clk, u32 div; if (parent < rate) - return rate; + return parent; div = (parent / rate) - 1; if (div > armclk_mask) @@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate) div = clk_get_rate(clk->parent) / rate; val = __raw_readl(S3C_CLK_DIV0); - val &= armclk_mask; + val &= ~armclk_mask; val |= (div - 1); __raw_writel(val, S3C_CLK_DIV0); |