REMOVE OMAP LEGACY CODE: Reset mach-omap1/board-*.c files to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / mmu.h

diff --git a/arch/arm/mach-omap1/mmu.h b/arch/arm/mach-omap1/mmu.h
index 9bda2975e9ffc79063db3fdd86babd2d1f986dd3..b0255af2b1d38d161a0603ff660a02e261ffb9b6 100644 (file)
--- a/arch/arm/mach-omap1/mmu.h
+++ b/arch/arm/mach-omap1/mmu.h
@@ -1,34 +1,33 @@
 #ifndef __MACH_OMAP1_MMU_H
 #define __MACH_OMAP1_MMU_H
 
-#include <asm/arch/mmu.h>
-#include <asm/io.h>
+#include <linux/io.h>
+#include <mach/mmu.h>
 
 #define MMU_LOCK_BASE_MASK             (0x3f << 10)
 #define MMU_LOCK_VICTIM_MASK           (0x3f << 4)
 
-#define OMAP_MMU_BASE                  (0xfffed200)
-#define OMAP_MMU_PREFETCH              (OMAP_MMU_BASE + 0x00)
-#define OMAP_MMU_WALKING_ST            (OMAP_MMU_BASE + 0x04)
-#define OMAP_MMU_CNTL                  (OMAP_MMU_BASE + 0x08)
-#define OMAP_MMU_FAULT_AD_H            (OMAP_MMU_BASE + 0x0c)
-#define OMAP_MMU_FAULT_AD_L            (OMAP_MMU_BASE + 0x10)
-#define OMAP_MMU_FAULT_ST              (OMAP_MMU_BASE + 0x14)
-#define OMAP_MMU_IT_ACK                        (OMAP_MMU_BASE + 0x18)
-#define OMAP_MMU_TTB_H                 (OMAP_MMU_BASE + 0x1c)
-#define OMAP_MMU_TTB_L                 (OMAP_MMU_BASE + 0x20)
-#define OMAP_MMU_LOCK                  (OMAP_MMU_BASE + 0x24)
-#define OMAP_MMU_LD_TLB                        (OMAP_MMU_BASE + 0x28)
-#define OMAP_MMU_CAM_H                 (OMAP_MMU_BASE + 0x2c)
-#define OMAP_MMU_CAM_L                 (OMAP_MMU_BASE + 0x30)
-#define OMAP_MMU_RAM_H                 (OMAP_MMU_BASE + 0x34)
-#define OMAP_MMU_RAM_L                 (OMAP_MMU_BASE + 0x38)
-#define OMAP_MMU_GFLUSH                        (OMAP_MMU_BASE + 0x3c)
-#define OMAP_MMU_FLUSH_ENTRY           (OMAP_MMU_BASE + 0x40)
-#define OMAP_MMU_READ_CAM_H            (OMAP_MMU_BASE + 0x44)
-#define OMAP_MMU_READ_CAM_L            (OMAP_MMU_BASE + 0x48)
-#define OMAP_MMU_READ_RAM_H            (OMAP_MMU_BASE + 0x4c)
-#define OMAP_MMU_READ_RAM_L            (OMAP_MMU_BASE + 0x50)
+#define OMAP_MMU_PREFETCH              0x00
+#define OMAP_MMU_WALKING_ST            0x04
+#define OMAP_MMU_CNTL                  0x08
+#define OMAP_MMU_FAULT_AD_H            0x0c
+#define OMAP_MMU_FAULT_AD_L            0x10
+#define OMAP_MMU_FAULT_ST              0x14
+#define OMAP_MMU_IT_ACK                        0x18
+#define OMAP_MMU_TTB_H                 0x1c
+#define OMAP_MMU_TTB_L                 0x20
+#define OMAP_MMU_LOCK                  0x24
+#define OMAP_MMU_LD_TLB                        0x28
+#define OMAP_MMU_CAM_H                 0x2c
+#define OMAP_MMU_CAM_L                 0x30
+#define OMAP_MMU_RAM_H                 0x34
+#define OMAP_MMU_RAM_L                 0x38
+#define OMAP_MMU_GFLUSH                        0x3c
+#define OMAP_MMU_FLUSH_ENTRY           0x40
+#define OMAP_MMU_READ_CAM_H            0x44
+#define OMAP_MMU_READ_CAM_L            0x48
+#define OMAP_MMU_READ_RAM_H            0x4c
+#define OMAP_MMU_READ_RAM_L            0x50
 
 #define OMAP_MMU_CNTL_BURST_16MNGT_EN  0x0020
 #define OMAP_MMU_CNTL_WTL_EN           0x0004
@@ -67,6 +66,7 @@
 #define OMAP_MMU_CAM_PAGESIZE_64KB     OMAP_MMU_CAM_L_PAGESIZE_64KB
 #define OMAP_MMU_CAM_PAGESIZE_4KB      OMAP_MMU_CAM_L_PAGESIZE_4KB
 #define OMAP_MMU_CAM_PAGESIZE_1KB      OMAP_MMU_CAM_L_PAGESIZE_1KB
+#define OMAP_MMU_CAM_PAGESIZE_16MB     -1 /* unused in omap1 */
 
 #define OMAP_MMU_RAM_L_RAM_LSB_MASK    0xfc00
 #define OMAP_MMU_RAM_L_AP_MASK         0x0300
@@ -76,16 +76,17 @@
 
 #define OMAP_MMU_LD_TLB_RD             0x0002
 
-#define INIT_TLB_ENTRY(ent,v,p,ps)                     \
+#define INIT_TLB_ENTRY(ent, v, p, ps)                  \
 do {                                                   \
        (ent)->va       = (v);                          \
        (ent)->pa       = (p);                          \
        (ent)->pgsz     = (ps);                         \
        (ent)->prsvd    = 0;                            \
        (ent)->ap       = OMAP_MMU_RAM_L_AP_FA;         \
+       (ent)->tlb      = 1;                            \
 } while (0)
 
-#define INIT_TLB_ENTRY_4KB_PRESERVED(ent,v,p)          \
+#define INIT_TLB_ENTRY_4KB_PRESERVED(ent, v, p)        \
 do {                                                   \
        (ent)->va       = (v);                          \
        (ent)->pa       = (p);                          \
@@ -94,14 +95,13 @@ do {                                                        \
        (ent)->ap       = OMAP_MMU_RAM_L_AP_FA;         \
 } while (0)
 
-extern struct omap_mmu_ops omap1_mmu_ops;
-
 struct omap_mmu_tlb_entry {
        unsigned long va;
        unsigned long pa;
        unsigned int pgsz, prsvd, valid;
 
        u16 ap;
+       unsigned int tlb;
 };
 
 static inline unsigned short
@@ -116,12 +116,4 @@ static inline void omap_mmu_write_reg(struct omap_mmu *mmu,
        __raw_writew(val, mmu->base + reg);
 }
 
-int omap_dsp_request_mem(void);
-void omap_dsp_release_mem(void);
-
-static inline void omap_mmu_itack(struct omap_mmu *mmu)
-{
-       omap_mmu_write_reg(mmu, OMAP_MMU_IT_ACK_IT_ACK, OMAP_MMU_IT_ACK);
-}
-
 #endif /* __MACH_OMAP1_MMU_H */