diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-08-28 19:50:33 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-08-28 19:50:33 +0200 |
| commit | 941132606c7611246d2034cb7b01f9270c2d1ede (patch) | |
| tree | e53a618c4e98d3716551afa2e6cfae2be81056a0 /arch/arm/mach-omap2/pm-debug.c | |
| parent | Linux 2.6.31-rc8 (diff) | |
| download | linux-941132606c7611246d2034cb7b01f9270c2d1ede.tar.xz linux-941132606c7611246d2034cb7b01f9270c2d1ede.zip | |
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/mach-omap2/pm-debug.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 6cc375a275be..da3a53f8ccc8 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -48,7 +48,7 @@ int omap2_pm_debug; regs[reg_count++].val = __raw_readl(reg) #define DUMP_INTC_REG(reg, off) \ regs[reg_count].name = #reg; \ - regs[reg_count++].val = __raw_readl(IO_ADDRESS(0x480fe000 + (off))) + regs[reg_count++].val = __raw_readl(OMAP2_IO_ADDRESS(0x480fe000 + (off))) void omap2_pm_dump(int mode, int resume, unsigned int us) { |