diff options
Diffstat (limited to 'arch/arm/plat-omap/include/mach/io.h')
-rw-r--r-- | arch/arm/plat-omap/include/mach/io.h | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index 2a30b7d88cde..adc83b7b8205 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h | |||
@@ -55,14 +55,13 @@ | |||
55 | 55 | ||
56 | #if defined(CONFIG_ARCH_OMAP1) | 56 | #if defined(CONFIG_ARCH_OMAP1) |
57 | 57 | ||
58 | #define IO_PHYS 0xFFFB0000 | 58 | #define IO_PHYS 0xFFFB0000 |
59 | #define IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ | 59 | #define IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ |
60 | #define IO_SIZE 0x40000 | 60 | #define IO_SIZE 0x40000 |
61 | #define IO_VIRT (IO_PHYS - IO_OFFSET) | 61 | #define IO_VIRT (IO_PHYS - IO_OFFSET) |
62 | #define IO_ADDRESS(pa) ((pa) - IO_OFFSET) | 62 | #define __IO_ADDRESS(pa) ((pa) - IO_OFFSET) |
63 | #define OMAP1_IO_ADDRESS(pa) ((pa) - IO_OFFSET) | 63 | #define __OMAP1_IO_ADDRESS(pa) ((pa) - IO_OFFSET) |
64 | #define io_p2v(pa) ((pa) - IO_OFFSET) | 64 | #define io_v2p(va) ((va) + IO_OFFSET) |
65 | #define io_v2p(va) ((va) + IO_OFFSET) | ||
66 | 65 | ||
67 | #elif defined(CONFIG_ARCH_OMAP2) | 66 | #elif defined(CONFIG_ARCH_OMAP2) |
68 | 67 | ||
@@ -74,7 +73,6 @@ | |||
74 | #define L4_24XX_VIRT 0xd8000000 | 73 | #define L4_24XX_VIRT 0xd8000000 |
75 | #define L4_24XX_SIZE SZ_1M /* 1MB of 128MB used, want 1MB sect */ | 74 | #define L4_24XX_SIZE SZ_1M /* 1MB of 128MB used, want 1MB sect */ |
76 | 75 | ||
77 | #ifdef CONFIG_ARCH_OMAP2430 | ||
78 | #define L4_WK_243X_PHYS L4_WK_243X_BASE /* 0x49000000 */ | 76 | #define L4_WK_243X_PHYS L4_WK_243X_BASE /* 0x49000000 */ |
79 | #define L4_WK_243X_VIRT 0xd9000000 | 77 | #define L4_WK_243X_VIRT 0xd9000000 |
80 | #define L4_WK_243X_SIZE SZ_1M | 78 | #define L4_WK_243X_SIZE SZ_1M |
@@ -88,13 +86,10 @@ | |||
88 | #define OMAP243X_SMS_VIRT 0xFC000000 | 86 | #define OMAP243X_SMS_VIRT 0xFC000000 |
89 | #define OMAP243X_SMS_SIZE SZ_1M | 87 | #define OMAP243X_SMS_SIZE SZ_1M |
90 | 88 | ||
91 | #endif | 89 | #define IO_OFFSET 0x90000000 |
92 | 90 | #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | |
93 | #define IO_OFFSET 0x90000000 | 91 | #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ |
94 | #define IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | 92 | #define io_v2p(va) ((va) - IO_OFFSET) /* Works for L3 and L4 */ |
95 | #define OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | ||
96 | #define io_p2v(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | ||
97 | #define io_v2p(va) ((va) - IO_OFFSET) /* Works for L3 and L4 */ | ||
98 | 93 | ||
99 | /* DSP */ | 94 | /* DSP */ |
100 | #define DSP_MEM_24XX_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */ | 95 | #define DSP_MEM_24XX_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */ |
@@ -149,9 +144,8 @@ | |||
149 | 144 | ||
150 | 145 | ||
151 | #define IO_OFFSET 0x90000000 | 146 | #define IO_OFFSET 0x90000000 |
152 | #define IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | 147 | #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ |
153 | #define OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | 148 | #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ |
154 | #define io_p2v(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | ||
155 | #define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ | 149 | #define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ |
156 | 150 | ||
157 | /* DSP */ | 151 | /* DSP */ |
@@ -167,7 +161,14 @@ | |||
167 | 161 | ||
168 | #endif | 162 | #endif |
169 | 163 | ||
170 | #ifndef __ASSEMBLER__ | 164 | #define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa)) |
165 | #define OMAP1_IO_ADDRESS(pa) IOMEM(__OMAP1_IO_ADDRESS(pa)) | ||
166 | #define OMAP2_IO_ADDRESS(pa) IOMEM(__OMAP2_IO_ADDRESS(pa)) | ||
167 | |||
168 | #ifdef __ASSEMBLER__ | ||
169 | #define IOMEM(x) x | ||
170 | #else | ||
171 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
171 | 172 | ||
172 | /* | 173 | /* |
173 | * Functions to access the OMAP IO region | 174 | * Functions to access the OMAP IO region |
@@ -178,13 +179,13 @@ | |||
178 | * - DO NOT use hardcoded virtual addresses to allow changing the | 179 | * - DO NOT use hardcoded virtual addresses to allow changing the |
179 | * IO address space again if needed | 180 | * IO address space again if needed |
180 | */ | 181 | */ |
181 | #define omap_readb(a) (*(volatile unsigned char *)IO_ADDRESS(a)) | 182 | #define omap_readb(a) __raw_readb(IO_ADDRESS(a)) |
182 | #define omap_readw(a) (*(volatile unsigned short *)IO_ADDRESS(a)) | 183 | #define omap_readw(a) __raw_readw(IO_ADDRESS(a)) |
183 | #define omap_readl(a) (*(volatile unsigned int *)IO_ADDRESS(a)) | 184 | #define omap_readl(a) __raw_readl(IO_ADDRESS(a)) |
184 | 185 | ||
185 | #define omap_writeb(v,a) (*(volatile unsigned char *)IO_ADDRESS(a) = (v)) | 186 | #define omap_writeb(v,a) __raw_writeb(v, IO_ADDRESS(a)) |
186 | #define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v)) | 187 | #define omap_writew(v,a) __raw_writew(v, IO_ADDRESS(a)) |
187 | #define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v)) | 188 | #define omap_writel(v,a) __raw_writel(v, IO_ADDRESS(a)) |
188 | 189 | ||
189 | extern void omap1_map_common_io(void); | 190 | extern void omap1_map_common_io(void); |
190 | extern void omap1_init_common_hw(void); | 191 | extern void omap1_init_common_hw(void); |
@@ -192,6 +193,12 @@ extern void omap1_init_common_hw(void); | |||
192 | extern void omap2_map_common_io(void); | 193 | extern void omap2_map_common_io(void); |
193 | extern void omap2_init_common_hw(void); | 194 | extern void omap2_init_common_hw(void); |
194 | 195 | ||
196 | #define __arch_ioremap(p,s,t) omap_ioremap(p,s,t) | ||
197 | #define __arch_iounmap(v) omap_iounmap(v) | ||
198 | |||
199 | void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type); | ||
200 | void omap_iounmap(volatile void __iomem *addr); | ||
201 | |||
195 | #endif | 202 | #endif |
196 | 203 | ||
197 | #endif | 204 | #endif |