diff options
author | Tony Lindgren <tony@atomide.com> | 2011-10-04 21:17:41 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-10-19 19:34:11 -0400 |
commit | 4c3cf90117f1f4906d5975aeccc5ffd414807fd2 (patch) | |
tree | 97ffb9d131b69b694229bd8c2f7f27303ee6d4d0 /arch/arm/mach-omap2/sdrc.c | |
parent | a66cb3454f220f49f900646ebdc76cb943319eb7 (diff) |
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/sdrc.c')
-rw-r--r-- | arch/arm/mach-omap2/sdrc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c index da6f3a63b5d5..8f2782874771 100644 --- a/arch/arm/mach-omap2/sdrc.c +++ b/arch/arm/mach-omap2/sdrc.c | |||
@@ -117,15 +117,10 @@ int omap2_sdrc_get_params(unsigned long r, | |||
117 | 117 | ||
118 | void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) | 118 | void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) |
119 | { | 119 | { |
120 | /* Static mapping, never released */ | 120 | if (omap2_globals->sdrc) |
121 | if (omap2_globals->sdrc) { | 121 | omap2_sdrc_base = omap2_globals->sdrc; |
122 | omap2_sdrc_base = ioremap(omap2_globals->sdrc, SZ_64K); | 122 | if (omap2_globals->sms) |
123 | WARN_ON(!omap2_sdrc_base); | 123 | omap2_sms_base = omap2_globals->sms; |
124 | } | ||
125 | if (omap2_globals->sms) { | ||
126 | omap2_sms_base = ioremap(omap2_globals->sms, SZ_64K); | ||
127 | WARN_ON(!omap2_sms_base); | ||
128 | } | ||
129 | } | 124 | } |
130 | 125 | ||
131 | /** | 126 | /** |