OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead

[deliverable/linux.git] / arch / arm / plat-omap / io.c

diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index 9b42d72d96cf9b3b822bb1e8ee29d57357839d66..d491ad15f1986f0f4c9f225ae52070412683f175 100644 (file)
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -132,3 +132,61 @@ void omap_iounmap(volatile void __iomem *addr)
                __iounmap(addr);
 }
 EXPORT_SYMBOL(omap_iounmap);
+
+/*
+ * NOTE: Please use ioremap + __raw_read/write where possible instead of these
+ */
+
+u8 omap_readb(u32 pa)
+{
+       if (cpu_class_is_omap1())
+               return __raw_readb(OMAP1_IO_ADDRESS(pa));
+       else
+               return __raw_readb(OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_readb);
+
+u16 omap_readw(u32 pa)
+{
+       if (cpu_class_is_omap1())
+               return __raw_readw(OMAP1_IO_ADDRESS(pa));
+       else
+               return __raw_readw(OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_readw);
+
+u32 omap_readl(u32 pa)
+{
+       if (cpu_class_is_omap1())
+               return __raw_readl(OMAP1_IO_ADDRESS(pa));
+       else
+               return __raw_readl(OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_readl);
+
+void omap_writeb(u8 v, u32 pa)
+{
+       if (cpu_class_is_omap1())
+               __raw_writeb(v, OMAP1_IO_ADDRESS(pa));
+       else
+               __raw_writeb(v, OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_writeb);
+
+void omap_writew(u16 v, u32 pa)
+{
+       if (cpu_class_is_omap1())
+               __raw_writew(v, OMAP1_IO_ADDRESS(pa));
+       else
+               __raw_writew(v, OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_writew);
+
+void omap_writel(u32 v, u32 pa)
+{
+       if (cpu_class_is_omap1())
+               __raw_writel(v, OMAP1_IO_ADDRESS(pa));
+       else
+               __raw_writel(v, OMAP2_IO_ADDRESS(pa));
+}
+EXPORT_SYMBOL(omap_writel);