diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 05:47:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 05:47:55 -0400 |
| commit | 0a52ac8d181e938d640c2da70cad6d1301abe775 (patch) | |
| tree | 046edf3437a49d3f6989d152bd94fcc80906b86d /arch/arm/plat-s3c64xx | |
| parent | e81b795d44ba04beab7714de65ed2e377823bd37 (diff) | |
| parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/plat-s3c64xx')
| -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 1debc1f9f987..febac1950d8e 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, | |||
| 153 | u32 div; | 153 | u32 div; |
| 154 | 154 | ||
| 155 | if (parent < rate) | 155 | if (parent < rate) |
| 156 | return rate; | 156 | return parent; |
| 157 | 157 | ||
| 158 | div = (parent / rate) - 1; | 158 | div = (parent / rate) - 1; |
| 159 | if (div > armclk_mask) | 159 | if (div > armclk_mask) |
| @@ -175,7 +175,7 @@ static int s3c64xx_clk_arm_set_rate(struct clk *clk, unsigned long rate) | |||
| 175 | div = clk_get_rate(clk->parent) / rate; | 175 | div = clk_get_rate(clk->parent) / rate; |
| 176 | 176 | ||
| 177 | val = __raw_readl(S3C_CLK_DIV0); | 177 | val = __raw_readl(S3C_CLK_DIV0); |
| 178 | val &= armclk_mask; | 178 | val &= ~armclk_mask; |
| 179 | val |= (div - 1); | 179 | val |= (div - 1); |
| 180 | __raw_writel(val, S3C_CLK_DIV0); | 180 | __raw_writel(val, S3C_CLK_DIV0); |
| 181 | 181 | ||