From 081b681dffcf9110a8ab8a17d78d4a5ba092ce2c Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Wed, 7 Mar 2012 02:00:05 -0800 Subject: [PATCH] --- yaml --- r: 295702 b: refs/heads/master c: 2e5ac9436645bb9fd2097868e228321f303c9c75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c24xx/common-s3c2443.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 1f429028e489..835577ae285b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9edc12a1a9db50fd7659463adf5a0e1eb5f2ce0d +refs/heads/master: 2e5ac9436645bb9fd2097868e228321f303c9c75 diff --git a/trunk/arch/arm/mach-s3c24xx/common-s3c2443.c b/trunk/arch/arm/mach-s3c24xx/common-s3c2443.c index 46795db2af41..7414890e6ee8 100644 --- a/trunk/arch/arm/mach-s3c24xx/common-s3c2443.c +++ b/trunk/arch/arm/mach-s3c24xx/common-s3c2443.c @@ -571,9 +571,6 @@ void __init_or_cpufreq s3c2443_common_setup_clocks(pll_fn get_mpll) struct clk *xtal_clk; unsigned long xtal; unsigned long pll; - unsigned long fclk; - unsigned long hclk; - unsigned long pclk; int ptr; xtal_clk = clk_get(NULL, "xtal"); @@ -582,17 +579,13 @@ void __init_or_cpufreq s3c2443_common_setup_clocks(pll_fn get_mpll) pll = get_mpll(mpllcon, xtal); clk_msysclk.clk.rate = pll; - - fclk = clk_get_rate(&clk_armdiv); - hclk = clk_get_rate(&clk_h); - pclk = clk_get_rate(&clk_p); - - s3c24xx_setup_clocks(fclk, hclk, pclk); + clk_mpll.rate = pll; printk("CPU: MPLL %s %ld.%03ld MHz, cpu %ld.%03ld MHz, mem %ld.%03ld MHz, pclk %ld.%03ld MHz\n", (mpllcon & S3C2443_PLLCON_OFF) ? "off" : "on", - print_mhz(pll), print_mhz(fclk), - print_mhz(hclk), print_mhz(pclk)); + print_mhz(pll), print_mhz(clk_get_rate(&clk_armdiv)), + print_mhz(clk_get_rate(&clk_h)), + print_mhz(clk_get_rate(&clk_p))); for (ptr = 0; ptr < ARRAY_SIZE(clksrc_clks); ptr++) s3c_set_clksrc(&clksrc_clks[ptr], true);