diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-10-04 18:17:41 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-10-19 16:34:11 -0700 |
| commit | 4c3cf90117f1f4906d5975aeccc5ffd414807fd2 (patch) | |
| tree | 97ffb9d131b69b694229bd8c2f7f27303ee6d4d0 /arch/arm/mach-omap2/prcm.c | |
| parent | a66cb3454f220f49f900646ebdc76cb943319eb7 (diff) | |
| download | blackbird-op-linux-4c3cf90117f1f4906d5975aeccc5ffd414807fd2.tar.gz blackbird-op-linux-4c3cf90117f1f4906d5975aeccc5ffd414807fd2.zip | |
ARM: OMAP: Move set_globals initialization to happen in init_early
Otherwise we can't do generic map_io as we currently rely on
static mappings that work only because of arch_ioremap.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.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.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 2e40a5cf0163..8db5f035eb0a 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -151,17 +151,10 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) { - /* Static mapping, never released */ - if (omap2_globals->prm) { - prm_base = ioremap(omap2_globals->prm, SZ_8K); - WARN_ON(!prm_base); - } - if (omap2_globals->cm) { - cm_base = ioremap(omap2_globals->cm, SZ_8K); - WARN_ON(!cm_base); - } - if (omap2_globals->cm2) { - cm2_base = ioremap(omap2_globals->cm2, SZ_8K); - WARN_ON(!cm2_base); - } + if (omap2_globals->prm) + prm_base = omap2_globals->prm; + if (omap2_globals->cm) + cm_base = omap2_globals->cm; + if (omap2_globals->cm2) + cm2_base = omap2_globals->cm2; } |
