diff options
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r-- | arch/arm/mach-omap2/control.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index aab884fecc55..e34d27f8c49c 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
@@ -149,17 +149,11 @@ static struct omap3_control_regs control_context; | |||
149 | 149 | ||
150 | void __init omap2_set_globals_control(struct omap_globals *omap2_globals) | 150 | void __init omap2_set_globals_control(struct omap_globals *omap2_globals) |
151 | { | 151 | { |
152 | /* Static mapping, never released */ | 152 | if (omap2_globals->ctrl) |
153 | if (omap2_globals->ctrl) { | 153 | omap2_ctrl_base = omap2_globals->ctrl; |
154 | omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K); | ||
155 | WARN_ON(!omap2_ctrl_base); | ||
156 | } | ||
157 | 154 | ||
158 | /* Static mapping, never released */ | 155 | if (omap2_globals->ctrl_pad) |
159 | if (omap2_globals->ctrl_pad) { | 156 | omap4_ctrl_pad_base = omap2_globals->ctrl_pad; |
160 | omap4_ctrl_pad_base = ioremap(omap2_globals->ctrl_pad, SZ_4K); | ||
161 | WARN_ON(!omap4_ctrl_pad_base); | ||
162 | } | ||
163 | } | 157 | } |
164 | 158 | ||
165 | void __iomem *omap_ctrl_base_get(void) | 159 | void __iomem *omap_ctrl_base_get(void) |