aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/prcm.c
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2010-02-15 07:33:37 -0500
committerTony Lindgren <tony@atomide.com>2010-02-23 13:57:40 -0500
commitb7ebb10b0a9793effa4a74a3c29049b44c6b8176 (patch)
tree3559425a0c9b4759b25cc95b2690d139cfdfcc96 /arch/arm/mach-omap2/prcm.c
parente03d37d85909fd9b09e78087c57b45972a7664ad (diff)
omap2/3/4: ioremap omap_globals module
This is a clean-up patch towards dynamic allocation of IO space instead of using harcoded macros to calculate virtual addresses. Also update the sdrc, prcm and control module to allocate iospace dynamically Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
-rw-r--r--arch/arm/mach-omap2/prcm.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index e8e121a41d6d..338d5f67ef0d 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -279,9 +279,19 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, const char *name)
279 279
280void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) 280void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)
281{ 281{
282 prm_base = omap2_globals->prm; 282 /* Static mapping, never released */
283 cm_base = omap2_globals->cm; 283 if (omap2_globals->prm) {
284 cm2_base = omap2_globals->cm2; 284 prm_base = ioremap(omap2_globals->prm, SZ_8K);
285 WARN_ON(!prm_base);
286 }
287 if (omap2_globals->cm) {
288 cm_base = ioremap(omap2_globals->cm, SZ_8K);
289 WARN_ON(!cm_base);
290 }
291 if (omap2_globals->cm2) {
292 cm2_base = ioremap(omap2_globals->cm2, SZ_8K);
293 WARN_ON(!cm2_base);
294 }
285} 295}
286 296
287#ifdef CONFIG_ARCH_OMAP3 297#ifdef CONFIG_ARCH_OMAP3