summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2010-01-27 04:12:56 +0100
committerPaul Walmsley <paul@pwsan.com>2010-01-27 04:12:56 +0100
commit2c8a177eba6762ca828738c92efcdaed02d198bc (patch)
treefd5b484b1ec7b1cbf9d4b49726635002b662a5d3 /arch/arm/mach-omap2
parentAM35xx: Add AM35xx specific control module registers (diff)
downloadlinux-2c8a177eba6762ca828738c92efcdaed02d198bc.tar.xz
linux-2c8a177eba6762ca828738c92efcdaed02d198bc.zip
OMAP3 clock: reorganize CK_* platform flags
Add CK_* flags for the two new Sitara chips, AM3505 and AM3517, and the OMAP34xx die shrink, OMAP36xx/OMAP37xx. Introduce a new CK_* flag, CK_3XXX, that marks all clocks that are common to OMAP3 family chips. CK_343X now refers to clocks that are available only on OMAP34{1,2,3,4}0 (WTBU) and OMAP35{03,15,25,30} (any version). At some point, the RATE_IN_* flags should be updated also. While here, add some documentation describing the chip families covered by these clock flags. This patch is partially based on patches from Ranjith Lohithakshan <ranjithl@ti.com> and Vishwanath Sripathy <vishwanath.bs@ti.com>. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Ranjith Lohithakshan <ranjithl@ti.com> Cc: Vishwanath Sripathy <vishwanath.bs@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/clock34xx_data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock34xx_data.c b/arch/arm/mach-omap2/clock34xx_data.c
index 74930e3158e3..ea8a0fa0088c 100644
--- a/arch/arm/mach-omap2/clock34xx_data.c
+++ b/arch/arm/mach-omap2/clock34xx_data.c
@@ -3216,11 +3216,11 @@ int __init omap2_clk_init(void)
/* struct prcm_config *prcm; */
struct omap_clk *c;
/* u32 clkrate; */
- u32 cpu_clkflg;
+ u32 cpu_clkflg = CK_3XXX;
if (cpu_is_omap34xx()) {
cpu_mask = RATE_IN_343X;
- cpu_clkflg = CK_343X;
+ cpu_clkflg |= CK_343X;
/*
* Update this if there are further clock changes between ES2