ARM: OMAP: Warn if omap_ioremap is called before SoC detection
authorTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 00:22:39 +0000 (17:22 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 19 Oct 2011 23:34:11 +0000 (16:34 -0700)
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>
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/include/plat/io.h
arch/arm/plat-omap/io.c

index 8140a4ed66e49ff3734071741577bd796d722c6a..fd9eb0984121892e7f447ecc28bcf54076cd7ece 100644 (file)
@@ -121,6 +121,7 @@ void __init omap16xx_map_io(void)
 void omap1_init_early(void)
 {
        omap_check_revision();
+       omap_ioremap_init();
 
        /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
         * on a Posted Write in the TIPB Bridge".
index d5caac3698dd9d6d36368ac6a02e39288a412110..aa96538f3fee17845a90e6b858f28c91b3266426 100644 (file)
@@ -323,6 +323,7 @@ void __iomem *omap_irq_base;
 static void __init omap_common_init_early(void)
 {
        omap2_check_revision();
+       omap_ioremap_init();
 }
 
 static void __init omap_hwmod_init_postsetup(void)
index c0c78507314167805152ec3a7e850c83d79e06ad..5ffbea60be451e119fa49b0228d7a31541589aaf 100644 (file)
  * NOTE: Please use ioremap + __raw_read/write where possible instead of these
  */
 
+void omap_ioremap_init(void);
+
 extern u8 omap_readb(u32 pa);
 extern u16 omap_readw(u32 pa);
 extern u32 omap_readl(u32 pa);
index f1ecfa9fc61d3c4c45a6a145d43bfa202af37176..1bbcbde76400e30a88abe09d80f35cd96fa6e5e8 100644 (file)
 #define BETWEEN(p,st,sz)       ((p) >= (st) && (p) < ((st) + (sz)))
 #define XLATE(p,pst,vst)       ((void __iomem *)((p) - (pst) + (vst)))
 
+static int initialized;
+
 /*
  * Intercept ioremap() requests for addresses in our fixed mapping regions.
  */
 void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
 {
+
+       WARN(!initialized, "Do not use ioremap before init_early\n");
+
 #ifdef CONFIG_ARCH_OMAP1
        if (cpu_class_is_omap1()) {
                if (BETWEEN(p, OMAP1_IO_PHYS, OMAP1_IO_SIZE))
@@ -139,3 +144,8 @@ void omap_iounmap(volatile void __iomem *addr)
                __iounmap(addr);
 }
 EXPORT_SYMBOL(omap_iounmap);
+
+void __init omap_ioremap_init(void)
+{
+       initialized++;
+}