diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-17 09:29:03 -0400 |
| commit | 11cd4cb5f55cdc2f487b8c714610aa3538e28103 (patch) | |
| tree | 81376ff23d9a706c3d4f45e5cf4d213e63abd2ed /arch/arm/mach-s3c2443 | |
| parent | 485bdde78747f7ce2af164406c32db23e4688925 (diff) | |
| parent | 55b404fd78792d7a88d19f2534510ee42841146f (diff) | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 2f60bf6b8d43..f854e7385e3c 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) | |||
| 1033 | 1033 | ||
| 1034 | fclk = pll / s3c2443_fclk_div(clkdiv0); | 1034 | fclk = pll / s3c2443_fclk_div(clkdiv0); |
| 1035 | hclk = s3c2443_prediv_getrate(&clk_prediv); | 1035 | hclk = s3c2443_prediv_getrate(&clk_prediv); |
| 1036 | hclk = hclk / s3c2443_get_hdiv(clkdiv0); | 1036 | hclk /= s3c2443_get_hdiv(clkdiv0); |
| 1037 | hclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_HCLK) ? 2 : 1); | ||
| 1038 | pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); | 1037 | pclk = hclk / ((clkdiv0 & S3C2443_CLKDIV0_HALF_PCLK) ? 2 : 1); |
| 1039 | 1038 | ||
| 1040 | s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); | 1039 | s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); |