diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-02-23 00:09:20 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-02-24 14:16:15 -0500 |
commit | 657ebfadc19c5a14f709dee1645082828330d5d4 (patch) | |
tree | 26d615ae6e76437e0852b8d7fc060a070786f369 /arch/arm/mach-omap2/clock.c | |
parent | b92c170d019db7554db95380d2e1dfb3a368e350 (diff) |
OMAP3/4 clock: split into per-chip family files
clock34xx_data.c now contains data for the OMAP34xx family, the
OMAP36xx family, and the OMAP3517 family, so rename it to
clock3xxx_data.c. Rename clock34xx.c to clock3xxx.c, and move the
chip family-specific clock functions to clock34xx.c, clock36xx.c, or
clock3517.c, as appropriate. So now "clock3xxx.*" refers to the OMAP3
superset.
The main goal here is to prepare to compile chip family-specific clock
functions only for kernel builds that target that chip family. To get to
that point, we also need to add CONFIG_SOC_* options for those other
chip families; that will be done in future patches, planned for 2.6.35.
OMAP4 is also affected by this. It duplicated the OMAP3 non-CORE DPLL
clkops structure. The OMAP4 variant of this clkops structure has been
removed, and since there was nothing else currently in clock44xx.c, it
too has been removed -- it can always be added back later when there
is some content for it. (The OMAP4 clock autogeneration scripts have been
updated accordingly.)
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: BenoƮt Cousson <b-cousson@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Ranjith Lohithakshan <ranjithl@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 9df5937999cb..82b17ef17dbe 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -336,6 +336,18 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) | |||
336 | return omap2_clksel_set_parent(clk, new_parent); | 336 | return omap2_clksel_set_parent(clk, new_parent); |
337 | } | 337 | } |
338 | 338 | ||
339 | /* OMAP3/4 non-CORE DPLL clkops */ | ||
340 | |||
341 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) | ||
342 | |||
343 | const struct clkops clkops_omap3_noncore_dpll_ops = { | ||
344 | .enable = omap3_noncore_dpll_enable, | ||
345 | .disable = omap3_noncore_dpll_disable, | ||
346 | }; | ||
347 | |||
348 | #endif | ||
349 | |||
350 | |||
339 | /*------------------------------------------------------------------------- | 351 | /*------------------------------------------------------------------------- |
340 | * Omap2 clock reset and init functions | 352 | * Omap2 clock reset and init functions |
341 | *-------------------------------------------------------------------------*/ | 353 | *-------------------------------------------------------------------------*/ |