aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-10-05 20:22:39 -0400
committerTony Lindgren <tony@atomide.com>2011-10-19 19:34:11 -0400
commit8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (patch)
tree98de30830a3f40247a00a6bccd92255b69a7b52d /arch/arm/plat-omap
parent4c3cf90117f1f4906d5975aeccc5ffd414807fd2 (diff)
ARM: OMAP: Warn if omap_ioremap is called before SoC detection
We don't have cpu_is_omapxxxx SoC detection initialized until SoC detection is initialized from init_early. Note that with the common map_io we should no longer need cpu_is_omapxxxx for ioremap. Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/io.h2
-rw-r--r--arch/arm/plat-omap/io.c10
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index c0c785073141..5ffbea60be45 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -247,6 +247,8 @@
247 * NOTE: Please use ioremap + __raw_read/write where possible instead of these 247 * NOTE: Please use ioremap + __raw_read/write where possible instead of these
248 */ 248 */
249 249
250void omap_ioremap_init(void);
251
250extern u8 omap_readb(u32 pa); 252extern u8 omap_readb(u32 pa);
251extern u16 omap_readw(u32 pa); 253extern u16 omap_readw(u32 pa);
252extern u32 omap_readl(u32 pa); 254extern u32 omap_readl(u32 pa);
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index f1ecfa9fc61d..1bbcbde76400 100644
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -23,11 +23,16 @@
23#define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz))) 23#define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz)))
24#define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst))) 24#define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst)))
25 25
26static int initialized;
27
26/* 28/*
27 * Intercept ioremap() requests for addresses in our fixed mapping regions. 29 * Intercept ioremap() requests for addresses in our fixed mapping regions.
28 */ 30 */
29void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) 31void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
30{ 32{
33
34 WARN(!initialized, "Do not use ioremap before init_early\n");
35
31#ifdef CONFIG_ARCH_OMAP1 36#ifdef CONFIG_ARCH_OMAP1
32 if (cpu_class_is_omap1()) { 37 if (cpu_class_is_omap1()) {
33 if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE)) 38 if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE))
@@ -139,3 +144,8 @@ void omap_iounmap(volatile void __iomem *addr)
139 __iounmap(addr); 144 __iounmap(addr);
140} 145}
141EXPORT_SYMBOL(omap_iounmap); 146EXPORT_SYMBOL(omap_iounmap);
147
148void __init omap_ioremap_init(void)
149{
150 initialized++;
151}