summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c64xx/s3c6400-clock.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-15 14:03:34 +0200
committerBen Dooks <ben-linux@fluff.org>2009-07-30 00:47:14 +0200
commit1d91e1a296244690461a7c36d71710dfbabbc219 (patch)
tree00ee7edcad216189a5ff027fc7714ad459c607c8 /arch/arm/plat-s3c64xx/s3c6400-clock.c
parentS3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip (diff)
downloadlinux-1d91e1a296244690461a7c36d71710dfbabbc219.tar.xz
linux-1d91e1a296244690461a7c36d71710dfbabbc219.zip
S3C64XX: Fix get_rate() for ARMCLK
If the requested clock is faster than the parent clock then the parent clock is the closest we can get to the request so we need to return that instead of the requested clock. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx/s3c6400-clock.c')
-rw-r--r--arch/arm/plat-s3c64xx/s3c6400-clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/s3c6400-clock.c b/arch/arm/plat-s3c64xx/s3c6400-clock.c
index 1debc1f9f987..f8165e622478 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)