diff options
| author | Roman Tereshonkov <roman.tereshonkov@nokia.com> | 2008-03-13 21:35:09 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 10:29:39 -0700 |
| commit | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (patch) | |
| tree | fdb1d97cec8ed3f8d40bbcdabdca55fcbd26ce21 /arch/arm/mach-omap2/clock34xx.c | |
| parent | 02e19a960a519224a74da4d190965201044c1583 (diff) | |
| download | blackbird-op-linux-3760d31f11bfbd0ead9eaeb8573e0602437a9d7c.tar.gz blackbird-op-linux-3760d31f11bfbd0ead9eaeb8573e0602437a9d7c.zip | |
ARM: OMAP2: New DPLL clock framework
These changes is the result of the discussion with Paul Walmsley.
His ideas are included into this patch.
Remove DPLL output divider handling from DPLLs and CLKOUTX2 clocks,
and place it into specific DPLL output divider clocks (e.g., dpll3_m2_clk).
omap2_get_dpll_rate() now returns the correct DPLL rate, as represented
by the DPLL's CLKOUT output. Also add MPU and IVA2 subsystem clocks, along
with high-frequency bypass support.
Add support for DPLLs function in locked and bypass clock modes.
Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index f6c82a333815..b42bdd6079a5 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -212,10 +212,10 @@ int __init omap2_clk_init(void) recalculate_root_clocks(); - printk(KERN_INFO "Clocking rate (Crystal/DPLL/MPU): " + printk(KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): " "%ld.%01ld/%ld/%ld MHz\n", (osc_sys_ck.rate / 1000000), (osc_sys_ck.rate / 100000) % 10, - (core_ck.rate / 1000000), (dpll1_fck.rate / 1000000)) ; + (core_ck.rate / 1000000), (arm_fck.rate / 1000000)); /* * Only enable those clocks we will need, let the drivers |
