summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2443
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-17 14:29:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-17 14:29:03 +0100
commit11cd4cb5f55cdc2f487b8c714610aa3538e28103 (patch)
tree81376ff23d9a706c3d4f45e5cf4d213e63abd2ed /arch/arm/mach-s3c2443
parent485bdde78747f7ce2af164406c32db23e4688925 (diff)
parent55b404fd78792d7a88d19f2534510ee42841146f (diff)
downloadop-kernel-dev-11cd4cb5f55cdc2f487b8c714610aa3538e28103.zip
op-kernel-dev-11cd4cb5f55cdc2f487b8c714610aa3538e28103.tar.gz
Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/mach-s3c2443')
-rw-r--r--arch/arm/mach-s3c2443/clock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c
index 2f60bf6..f854e73 100644
--- a/arch/arm/mach-s3c2443/clock.c
+++ b/arch/arm/mach-s3c2443/clock.c
@@ -1033,8 +1033,7 @@ void __init s3c2443_init_clocks(int xtal)
fclk = pll / s3c2443_fclk_div(clkdiv0);
hclk = s3c2443_prediv_getrate(&clk_prediv);
- hclk = hclk / s3c2443_get_hdiv(clkdiv0);
- hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1);
+ hclk /= s3c2443_get_hdiv(clkdiv0);
pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1);
s3c24xx_setup_clocks(xtal, fclk, hclk, pclk);
OpenPOWER on IntegriCloud