diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-08-28 13:50:33 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-08-28 13:50:33 -0400 |
| commit | 941132606c7611246d2034cb7b01f9270c2d1ede (patch) | |
| tree | e53a618c4e98d3716551afa2e6cfae2be81056a0 /arch/arm/plat-omap/include/mach/mtd-xip.h | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead
Search and replace OMAP_IO_ADDRESS with OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS,
and convert omap_read/write into a functions instead of a macros.
Also rename OMAP_MPUIO_VBASE to OMAP1_MPUIO_VBASE.
In the long run, most code should use ioremap + __raw_read/write instead.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/mtd-xip.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/mtd-xip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/mtd-xip.h b/arch/arm/plat-omap/include/mach/mtd-xip.h index 39b591ff54bb..f82a8dcaad94 100644 --- a/arch/arm/plat-omap/include/mach/mtd-xip.h +++ b/arch/arm/plat-omap/include/mach/mtd-xip.h | |||
| @@ -25,7 +25,7 @@ typedef struct { | |||
| 25 | } xip_omap_mpu_timer_regs_t; | 25 | } xip_omap_mpu_timer_regs_t; |
| 26 | 26 | ||
| 27 | #define xip_omap_mpu_timer_base(n) \ | 27 | #define xip_omap_mpu_timer_base(n) \ |
| 28 | ((volatile xip_omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE + \ | 28 | ((volatile xip_omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE + \ |
| 29 | (n)*OMAP_MPU_TIMER_OFFSET)) | 29 | (n)*OMAP_MPU_TIMER_OFFSET)) |
| 30 | 30 | ||
| 31 | static inline unsigned long xip_omap_mpu_timer_read(int nr) | 31 | static inline unsigned long xip_omap_mpu_timer_read(int nr) |