diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-07-03 05:24:43 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-07-03 05:24:43 -0400 |
| commit | e1f80bfca86ab48b7bed731b32262fb1a2835de5 (patch) | |
| tree | a0f3ce14fac93dadaa98b67e26cd09fd453a5bde | |
| parent | f35ae6346850f6c192269b09088b20261760f0e0 (diff) | |
ARM: OMAP: Remove __REG access for multi-omap
This does not play nicely with multi-omap as it cannot be replaced
by a function in io.c for omaps with different IO bases.
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | include/asm-arm/arch-omap/io.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h index 160578e1f557..e1fb7ec7d478 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/include/asm-arm/arch-omap/io.h | |||
| @@ -183,35 +183,12 @@ | |||
| 183 | #define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v)) | 183 | #define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v)) |
| 184 | #define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v)) | 184 | #define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v)) |
| 185 | 185 | ||
| 186 | /* 16 bit uses LDRH/STRH, base +/- offset_8 */ | ||
| 187 | typedef struct { volatile u16 offset[256]; } __regbase16; | ||
| 188 | #define __REGV16(vaddr) ((__regbase16 *)((vaddr)&~0xff)) \ | ||
| 189 | ->offset[((vaddr)&0xff)>>1] | ||
| 190 | #define __REG16(paddr) __REGV16(io_p2v(paddr)) | ||
| 191 | |||
| 192 | /* 8/32 bit uses LDR/STR, base +/- offset_12 */ | ||
| 193 | typedef struct { volatile u8 offset[4096]; } __regbase8; | ||
| 194 | #define __REGV8(vaddr) ((__regbase8 *)((vaddr)&~4095)) \ | ||
| 195 | ->offset[((vaddr)&4095)>>0] | ||
| 196 | #define __REG8(paddr) __REGV8(io_p2v(paddr)) | ||
| 197 | |||
| 198 | typedef struct { volatile u32 offset[4096]; } __regbase32; | ||
| 199 | #define __REGV32(vaddr) ((__regbase32 *)((vaddr)&~4095)) \ | ||
| 200 | ->offset[((vaddr)&4095)>>2] | ||
| 201 | #define __REG32(paddr) __REGV32(io_p2v(paddr)) | ||
| 202 | |||
| 203 | extern void omap1_map_common_io(void); | 186 | extern void omap1_map_common_io(void); |
| 204 | extern void omap1_init_common_hw(void); | 187 | extern void omap1_init_common_hw(void); |
| 205 | 188 | ||
| 206 | extern void omap2_map_common_io(void); | 189 | extern void omap2_map_common_io(void); |
| 207 | extern void omap2_init_common_hw(void); | 190 | extern void omap2_init_common_hw(void); |
| 208 | 191 | ||
| 209 | #else | ||
| 210 | |||
| 211 | #define __REG8(paddr) io_p2v(paddr) | ||
| 212 | #define __REG16(paddr) io_p2v(paddr) | ||
| 213 | #define __REG32(paddr) io_p2v(paddr) | ||
| 214 | |||
| 215 | #endif | 192 | #endif |
| 216 | 193 | ||
| 217 | #endif | 194 | #endif |
