diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-10-29 22:56:17 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 14:33:08 -0500 |
commit | b6ffa05091978c68e94d2802200f2aaa06a598d9 (patch) | |
tree | 4e2b9cc71015ba1103efe7ded485294a3aab19e7 /arch/arm/mach-omap2/cm2xxx_3xxx.h | |
parent | 187e3e06e8d7050a77c3208f54edff1e1bfae31d (diff) |
ARM: OMAP2xxx: APLL/CM: convert to use omap2_cm_wait_module_ready()
Convert the OMAP2xxx APLL code to use omap2_cm_wait_module_ready(),
and move the low-level CM register manipulation functions to
mach-omap2/cm2xxx.c. The objectives here are to remove the dependency
on the deprecated omap2_cm_wait_idlest() function in
mach-omap2/prcm.c, so that code can be removed later; and move
low-level register accesses to the CM IP block to the CM code, which
will soon be moved into drivers/.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/cm2xxx_3xxx.h')
-rw-r--r-- | arch/arm/mach-omap2/cm2xxx_3xxx.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.h b/arch/arm/mach-omap2/cm2xxx_3xxx.h index 0e26bb1bf7e2..f74a5d1b803f 100644 --- a/arch/arm/mach-omap2/cm2xxx_3xxx.h +++ b/arch/arm/mach-omap2/cm2xxx_3xxx.h | |||
@@ -96,6 +96,11 @@ static inline u32 omap2_cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) | |||
96 | return omap2_cm_rmw_mod_reg_bits(bits, 0x0, module, idx); | 96 | return omap2_cm_rmw_mod_reg_bits(bits, 0x0, module, idx); |
97 | } | 97 | } |
98 | 98 | ||
99 | extern int omap2xxx_cm_apll54_enable(void); | ||
100 | extern void omap2xxx_cm_apll54_disable(void); | ||
101 | extern int omap2xxx_cm_apll96_enable(void); | ||
102 | extern void omap2xxx_cm_apll96_disable(void); | ||
103 | |||
99 | #endif | 104 | #endif |
100 | 105 | ||
101 | /* CM register bits shared between 24XX and 3430 */ | 106 | /* CM register bits shared between 24XX and 3430 */ |
@@ -111,5 +116,4 @@ static inline u32 omap2_cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) | |||
111 | /* CM_IDLEST_GFX */ | 116 | /* CM_IDLEST_GFX */ |
112 | #define OMAP_ST_GFX_MASK (1 << 0) | 117 | #define OMAP_ST_GFX_MASK (1 << 0) |
113 | 118 | ||
114 | |||
115 | #endif | 119 | #endif |