diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-01-26 22:13:12 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-01-29 12:14:22 -0500 |
commit | e80a9729b15f4c2c00ed51d61aa543fb4269d5ca (patch) | |
tree | 74db413fdf841d7016c17dedcf74756e5927718e /arch/arm/mach-omap2/clock34xx_data.c | |
parent | d3730192294c1c98b17a67aadbbdc4c28ad05c6e (diff) |
OMAP2/3/4 clock: rename and clean the omap2_clk_init() functions
Rename the omap2_clk_init() in the OMAP2, 3, and 4 clock code to be
omap2xxx_clk_init(), omap3xxx_clk_init(), etc. Remove all traces of
the (commented) old virt_prcm_set code from omap3xxx_clk_init() and
omap4xxx_clk_init(), since this will be handled with the OPP code that
is cooking in the PM branch.
After this patch, there should be very little else in the clock code
that blocks a multi-OMAP 2+3 kernel. (OMAP2420+OMAP2430 still has some
outstanding issues that need to be resolved; this is pending on some
additions to the hwmod data.)
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock34xx_data.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/clock34xx_data.c b/arch/arm/mach-omap2/clock34xx_data.c index 9e7f68a8fca2..0d04f92f63e1 100644 --- a/arch/arm/mach-omap2/clock34xx_data.c +++ b/arch/arm/mach-omap2/clock34xx_data.c | |||
@@ -3212,11 +3212,9 @@ static struct omap_clk omap3xxx_clks[] = { | |||
3212 | }; | 3212 | }; |
3213 | 3213 | ||
3214 | 3214 | ||
3215 | int __init omap2_clk_init(void) | 3215 | int __init omap3xxx_clk_init(void) |
3216 | { | 3216 | { |
3217 | /* struct prcm_config *prcm; */ | ||
3218 | struct omap_clk *c; | 3217 | struct omap_clk *c; |
3219 | /* u32 clkrate; */ | ||
3220 | u32 cpu_clkflg = CK_3XXX; | 3218 | u32 cpu_clkflg = CK_3XXX; |
3221 | 3219 | ||
3222 | if (cpu_is_omap3517()) { | 3220 | if (cpu_is_omap3517()) { |
@@ -3254,21 +3252,6 @@ int __init omap2_clk_init(void) | |||
3254 | omap2_init_clk_clkdm(c->lk.clk); | 3252 | omap2_init_clk_clkdm(c->lk.clk); |
3255 | } | 3253 | } |
3256 | 3254 | ||
3257 | /* REVISIT: Not yet ready for OMAP3 */ | ||
3258 | #if 0 | ||
3259 | /* Check the MPU rate set by bootloader */ | ||
3260 | clkrate = omap2_get_dpll_rate_24xx(&dpll_ck); | ||
3261 | for (prcm = rate_table; prcm->mpu_speed; prcm++) { | ||
3262 | if (!(prcm->flags & cpu_mask)) | ||
3263 | continue; | ||
3264 | if (prcm->xtal_speed != sys_ck.rate) | ||
3265 | continue; | ||
3266 | if (prcm->dpll_speed <= clkrate) | ||
3267 | break; | ||
3268 | } | ||
3269 | curr_prcm_set = prcm; | ||
3270 | #endif | ||
3271 | |||
3272 | recalculate_root_clocks(); | 3255 | recalculate_root_clocks(); |
3273 | 3256 | ||
3274 | printk(KERN_INFO "Clocking rate (Crystal/Core/MPU): " | 3257 | printk(KERN_INFO "Clocking rate (Crystal/Core/MPU): " |