diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-02-15 07:33:37 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-23 13:57:40 -0500 |
commit | b7ebb10b0a9793effa4a74a3c29049b44c6b8176 (patch) | |
tree | 3559425a0c9b4759b25cc95b2690d139cfdfcc96 /arch/arm/mach-omap2/control.c | |
parent | e03d37d85909fd9b09e78087c57b45972a7664ad (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/control.c')
-rw-r--r-- | arch/arm/mach-omap2/control.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index cdd1f35636dd..43f8a33655d4 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
@@ -140,7 +140,11 @@ static struct omap3_control_regs control_context; | |||
140 | 140 | ||
141 | void __init omap2_set_globals_control(struct omap_globals *omap2_globals) | 141 | void __init omap2_set_globals_control(struct omap_globals *omap2_globals) |
142 | { | 142 | { |
143 | omap2_ctrl_base = omap2_globals->ctrl; | 143 | /* Static mapping, never released */ |
144 | if (omap2_globals->ctrl) { | ||
145 | omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K); | ||
146 | WARN_ON(!omap2_ctrl_base); | ||
147 | } | ||
144 | } | 148 | } |
145 | 149 | ||
146 | void __iomem *omap_ctrl_base_get(void) | 150 | void __iomem *omap_ctrl_base_get(void) |