diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 18:15:29 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-04 18:15:29 +0400 |
| commit | d63638440cfad75fb339fd1261bea0485c7c3ecc (patch) | |
| tree | d1705ceeef82eb0b7b58f9503a472be810f418f2 /arch/arm/mach-omap2/sdrc.c | |
| parent | f1e0477a7b7a541f51eea279910eed4ddd010033 (diff) | |
| parent | 1a67a573b8d9f02211f36fbab50f6265dc49384a (diff) | |
| download | linux-d63638440cfad75fb339fd1261bea0485c7c3ecc.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
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, void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) { - /* Static mapping, never released */ - if (omap2_globals->sdrc) { - omap2_sdrc_base = ioremap(omap2_globals->sdrc, SZ_64K); - WARN_ON(!omap2_sdrc_base); - } - if (omap2_globals->sms) { - omap2_sms_base = ioremap(omap2_globals->sms, SZ_64K); - WARN_ON(!omap2_sms_base); - } + if (omap2_globals->sdrc) + omap2_sdrc_base = omap2_globals->sdrc; + if (omap2_globals->sms) + omap2_sms_base = omap2_globals->sms; } /** |