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/dmtimer.c | |
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/dmtimer.c')
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 7f50b6103dee..d325b54daeb5 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -774,7 +774,10 @@ int __init omap_dm_timer_init(void) | |||
774 | 774 | ||
775 | for (i = 0; i < dm_timer_count; i++) { | 775 | for (i = 0; i < dm_timer_count; i++) { |
776 | timer = &dm_timers[i]; | 776 | timer = &dm_timers[i]; |
777 | timer->io_base = IO_ADDRESS(timer->phys_base); | 777 | if (cpu_class_is_omap1()) |
778 | timer->io_base = OMAP1_IO_ADDRESS(timer->phys_base); | ||
779 | else | ||
780 | timer->io_base = OMAP2_IO_ADDRESS(timer->phys_base); | ||
778 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ | 781 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \ |
779 | defined(CONFIG_ARCH_OMAP4) | 782 | defined(CONFIG_ARCH_OMAP4) |
780 | if (cpu_class_is_omap2()) { | 783 | if (cpu_class_is_omap2()) { |