aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r--arch/arm/mach-omap2/control.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index a8d20eef2306..99c0eb645d4d 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -25,6 +25,7 @@
25#include "sdrc.h" 25#include "sdrc.h"
26 26
27static void __iomem *omap2_ctrl_base; 27static void __iomem *omap2_ctrl_base;
28static void __iomem *omap4_ctrl_pad_base;
28 29
29#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) 30#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
30struct omap3_scratchpad { 31struct omap3_scratchpad {
@@ -145,6 +146,12 @@ void __init omap2_set_globals_control(struct omap_globals *omap2_globals)
145 omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K); 146 omap2_ctrl_base = ioremap(omap2_globals->ctrl, SZ_4K);
146 WARN_ON(!omap2_ctrl_base); 147 WARN_ON(!omap2_ctrl_base);
147 } 148 }
149
150 /* Static mapping, never released */
151 if (omap2_globals->ctrl_pad) {
152 omap4_ctrl_pad_base = ioremap(omap2_globals->ctrl_pad, SZ_4K);
153 WARN_ON(!omap4_ctrl_pad_base);
154 }
148} 155}
149 156
150void __iomem *omap_ctrl_base_get(void) 157void __iomem *omap_ctrl_base_get(void)