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 /drivers/video/omap | |
| 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 'drivers/video/omap')
| -rw-r--r-- | drivers/video/omap/dispc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 148cbcc39602..915439dc05a0 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -212,9 +212,9 @@ static void enable_rfbi_mode(int enable) dispc_write_reg(DISPC_CONTROL, l); /* Set bypass mode in RFBI module */ - l = __raw_readl(IO_ADDRESS(RFBI_CONTROL)); + l = __raw_readl(OMAP2_IO_ADDRESS(RFBI_CONTROL)); l |= enable ? 0 : (1 << 1); - __raw_writel(l, IO_ADDRESS(RFBI_CONTROL)); + __raw_writel(l, OMAP2_IO_ADDRESS(RFBI_CONTROL)); } static void set_lcd_data_lines(int data_lines) @@ -1421,7 +1421,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, } /* L3 firewall setting: enable access to OCM RAM */ - __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0)); + __raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0)); if ((r = alloc_palette_ram()) < 0) goto fail2; |