Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 295702
b: refs/heads/master
c: 2e5ac94
h: refs/heads/master
v: v3
  • Loading branch information
Heiko Stuebner authored and Kukjin Kim committed Mar 7, 2012
1 parent efa5286 commit 081b681
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9edc12a1a9db50fd7659463adf5a0e1eb5f2ce0d
refs/heads/master: 2e5ac9436645bb9fd2097868e228321f303c9c75
15 changes: 4 additions & 11 deletions trunk/arch/arm/mach-s3c24xx/common-s3c2443.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);
Expand Down

0 comments on commit 081b681

Please sign in to comment.