diff options
author | Roman Tereshonkov <roman.tereshonkov@nokia.com> | 2008-03-13 15:35:09 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 13:29:39 -0400 |
commit | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (patch) | |
tree | fdb1d97cec8ed3f8d40bbcdabdca55fcbd26ce21 /include/asm-arm/arch-omap/clock.h | |
parent | 02e19a960a519224a74da4d190965201044c1583 (diff) |
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 'include/asm-arm/arch-omap/clock.h')
-rw-r--r-- | include/asm-arm/arch-omap/clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-omap/clock.h b/include/asm-arm/arch-omap/clock.h index 0baa79acc0b7..57523bdb642b 100644 --- a/include/asm-arm/arch-omap/clock.h +++ b/include/asm-arm/arch-omap/clock.h | |||
@@ -33,8 +33,6 @@ struct dpll_data { | |||
33 | void __iomem *mult_div1_reg; | 33 | void __iomem *mult_div1_reg; |
34 | u32 mult_mask; | 34 | u32 mult_mask; |
35 | u32 div1_mask; | 35 | u32 div1_mask; |
36 | void __iomem *div2_reg; | ||
37 | u32 div2_mask; | ||
38 | # if defined(CONFIG_ARCH_OMAP3) | 36 | # if defined(CONFIG_ARCH_OMAP3) |
39 | void __iomem *control_reg; | 37 | void __iomem *control_reg; |
40 | u32 enable_mask; | 38 | u32 enable_mask; |