nfsd4: simplify lease/grace interaction

[safe/jmp/linux-2.6] / arch / arm / plat-omap / io.c

diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c
index 388fd94..0cfd54f 100644 (file)
--- a/arch/arm/plat-omap/io.c
+++ b/arch/arm/plat-omap/io.c
@@ -13,12 +13,12 @@
 #include <linux/io.h>
 #include <linux/mm.h>
 
-#include <mach/omap730.h>
-#include <mach/omap1510.h>
-#include <mach/omap16xx.h>
-#include <mach/omap24xx.h>
-#include <mach/omap34xx.h>
-#include <mach/omap44xx.h>
+#include <plat/omap7xx.h>
+#include <plat/omap1510.h>
+#include <plat/omap16xx.h>
+#include <plat/omap24xx.h>
+#include <plat/omap34xx.h>
+#include <plat/omap44xx.h>
 
 #define BETWEEN(p,st,sz)       ((p) >= (st) && (p) < ((st) + (sz)))
 #define XLATE(p,pst,vst)       ((void __iomem *)((p) - (pst) + (vst)))
@@ -34,12 +34,12 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
                        return XLATE(p, OMAP1_IO_PHYS, OMAP1_IO_VIRT);
        }
        if (cpu_is_omap7xx()) {
-               if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))
-                       return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);
+               if (BETWEEN(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_SIZE))
+                       return XLATE(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_START);
 
-               if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE))
-                       return XLATE(p, OMAP730_DSPREG_BASE,
-                                       OMAP730_DSPREG_START);
+               if (BETWEEN(p, OMAP7XX_DSPREG_BASE, OMAP7XX_DSPREG_SIZE))
+                       return XLATE(p, OMAP7XX_DSPREG_BASE,
+                                       OMAP7XX_DSPREG_START);
        }
        if (cpu_is_omap15xx()) {
                if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))
@@ -66,12 +66,12 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
                        return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT);
        }
        if (cpu_is_omap2420()) {
-               if (BETWEEN(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_SIZE))
-                       return XLATE(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_VIRT);
-               if (BETWEEN(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE))
-                       return XLATE(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE);
-               if (BETWEEN(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_SIZE))
-                       return XLATE(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_VIRT);
+               if (BETWEEN(p, DSP_MEM_2420_PHYS, DSP_MEM_2420_SIZE))
+                       return XLATE(p, DSP_MEM_2420_PHYS, DSP_MEM_2420_VIRT);
+               if (BETWEEN(p, DSP_IPI_2420_PHYS, DSP_IPI_2420_SIZE))
+                       return XLATE(p, DSP_IPI_2420_PHYS, DSP_IPI_2420_SIZE);
+               if (BETWEEN(p, DSP_MMU_2420_PHYS, DSP_MMU_2420_SIZE))
+                       return XLATE(p, DSP_MMU_2420_PHYS, DSP_MMU_2420_VIRT);
        }
        if (cpu_is_omap2430()) {
                if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE))
@@ -114,6 +114,14 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
                        return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT);
                if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE))
                        return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT);
+               if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE))
+                       return XLATE(p, OMAP44XX_EMIF1_PHYS,            \
+                                                       OMAP44XX_EMIF1_VIRT);
+               if (BETWEEN(p, OMAP44XX_EMIF2_PHYS, OMAP44XX_EMIF2_SIZE))
+                       return XLATE(p, OMAP44XX_EMIF2_PHYS,            \
+                                                       OMAP44XX_EMIF2_VIRT);
+               if (BETWEEN(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_SIZE))
+                       return XLATE(p, OMAP44XX_DMM_PHYS, OMAP44XX_DMM_VIRT);
                if (BETWEEN(p, L4_PER_44XX_PHYS, L4_PER_44XX_SIZE))
                        return XLATE(p, L4_PER_44XX_PHYS, L4_PER_44XX_VIRT);
                if (BETWEEN(p, L4_EMU_44XX_PHYS, L4_EMU_44XX_SIZE))
@@ -142,7 +150,7 @@ 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));
+               return __raw_readb(OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_readb);
 
@@ -151,7 +159,7 @@ 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));
+               return __raw_readw(OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_readw);
 
@@ -160,7 +168,7 @@ 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));
+               return __raw_readl(OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_readl);
 
@@ -169,7 +177,7 @@ 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));
+               __raw_writeb(v, OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_writeb);
 
@@ -178,7 +186,7 @@ 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));
+               __raw_writew(v, OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_writew);
 
@@ -187,6 +195,6 @@ 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));
+               __raw_writel(v, OMAP2_L4_IO_ADDRESS(pa));
 }
 EXPORT_SYMBOL(omap_writel);