Merge branch 'omap-all' into devel

Conflicts:

	arch/arm/mach-omap2/gpmc.c
	arch/arm/mach-omap2/irq.c

16 files changed, 149 insertions, 50 deletions

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index 51738bdd834e..d4e7dca06e4f 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -118,18 +118,21 @@ static int __init omap_rng_probe(struct platform_device *pdev)
 
         mem = request_mem_region(res->start, res->end - res->start + 1,
                                  pdev->name);
-        if (mem == NULL)
-                return -EBUSY;
+        if (mem == NULL) {
+                ret = -EBUSY;
+                goto err_region;
+        }
 
         dev_set_drvdata(&pdev->dev, mem);
-        rng_base = (u32 __force __iomem *)io_p2v(res->start);
+        rng_base = ioremap(res->start, res->end - res->start + 1);
+        if (!rng_base) {
+                ret = -ENOMEM;
+                goto err_ioremap;
+        }
 
         ret = hwrng_register(&omap_rng_ops);
-        if (ret) {
-                release_resource(mem);
-                rng_base = NULL;
-                return ret;
-        }
+        if (ret)
+                goto err_register;
 
         dev_info(&pdev->dev, "OMAP Random Number Generator ver. %02x\n",
                 omap_rng_read_reg(RNG_REV_REG));
@@ -138,6 +141,18 @@ static int __init omap_rng_probe(struct platform_device *pdev)
         rng_dev = pdev;
 
         return 0;
+
+err_register:
+        iounmap(rng_base);
+        rng_base = NULL;
+err_ioremap:
+        release_resource(mem);
+err_region:
+        if (cpu_is_omap24xx()) {
+                clk_disable(rng_ick);
+                clk_put(rng_ick);
+        }
+        return ret;
 }
 
 static int __exit omap_rng_remove(struct platform_device *pdev)
@@ -148,6 +163,8 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
 
         omap_rng_write_reg(RNG_MASK_REG, 0x0);
 
+        iounmap(rng_base);
+
         if (cpu_is_omap24xx()) {
                 clk_disable(rng_ick);
                 clk_put(rng_ick);
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e7eb7bf9ddec..608038d64f81 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -589,11 +589,16 @@ omap_i2c_probe(struct platform_device *pdev)
 
         dev->dev = &pdev->dev;
         dev->irq = irq->start;
-        dev->base = (void __iomem *) IO_ADDRESS(mem->start);
+        dev->base = ioremap(mem->start, mem->end - mem->start + 1);
+        if (!dev->base) {
+                r = -ENOMEM;
+                goto err_free_mem;
+        }
+
         platform_set_drvdata(pdev, dev);
 
         if ((r = omap_i2c_get_clocks(dev)) != 0)
-                goto err_free_mem;
+                goto err_iounmap;
 
         omap_i2c_unidle(dev);
 
@@ -640,6 +645,8 @@ err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_idle(dev);
         omap_i2c_put_clocks(dev);
+err_iounmap:
+        iounmap(dev->base);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
         kfree(dev);
@@ -661,6 +668,7 @@ omap_i2c_remove(struct platform_device *pdev)
         i2c_del_adapter(&dev->adapter);
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_put_clocks(dev);
+        iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(mem->start, (mem->end - mem->start) + 1);
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index dcea87a0bc56..039787f81ed8 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -62,7 +62,7 @@ struct omap_kp {
         unsigned int debounce;
 };
 
-DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
+static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
 
 static int *keymap;
 static unsigned int *row_gpios;
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index c16028872bbb..1b9fc3c6b875 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -172,7 +172,7 @@ struct mmc_omap_host {
         struct omap_mmc_platform_data *pdata;
 };
 
-void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
+static void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
 {
         unsigned long tick_ns;
 
@@ -182,7 +182,7 @@ void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot)
         }
 }
 
-void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
+static void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable)
 {
         unsigned long flags;
 
@@ -1455,7 +1455,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 
         host->irq = irq;
         host->phys_base = host->mem_res->start;
-        host->virt_base = (void __iomem *) IO_ADDRESS(host->phys_base);
+        host->virt_base = ioremap(res->start, res->end - res->start + 1);
+        if (!host->virt_base)
+                goto err_ioremap;
 
         if (cpu_is_omap24xx()) {
                 host->iclk = clk_get(&pdev->dev, "mmc_ick");
@@ -1510,6 +1512,8 @@ err_free_iclk:
                 clk_put(host->iclk);
         }
 err_free_mmc_host:
+        iounmap(host->virt_base);
+err_ioremap:
         kfree(host);
 err_free_mem_region:
         release_mem_region(res->start, res->end - res->start + 1);
@@ -1536,6 +1540,7 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->fclk && !IS_ERR(host->fclk))
                 clk_put(host->fclk);
 
+        iounmap(host->virt_base);
         release_mem_region(pdev->resource[0].start,
                            pdev->resource[0].end - pdev->resource[0].start + 1);
 
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 9ccc563d8730..8058533f8418 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2211,9 +2211,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
                 serial_outp(up, UART_EFR, efr);
         }
 
-#ifdef CONFIG_ARCH_OMAP15XX
+#ifdef CONFIG_ARCH_OMAP
         /* Workaround to enable 115200 baud on OMAP1510 internal ports */
-        if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) {
+        if (cpu_is_omap1510() && is_omap_port(up)) {
                 if (baud == 115200) {
                         quot = 1;
                         serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
@@ -2266,18 +2266,27 @@ serial8250_pm(struct uart_port *port, unsigned int state,
                 p->pm(port, state, oldstate);
 }
 
+static unsigned int serial8250_port_size(struct uart_8250_port *pt)
+{
+        if (pt->port.iotype == UPIO_AU)
+                return 0x100000;
+#ifdef CONFIG_ARCH_OMAP
+        if (is_omap_port(pt))
+                return 0x16 << pt->port.regshift;
+#endif
+        return 8 << pt->port.regshift;
+}
+
 /*
  * Resource handling.
  */
 static int serial8250_request_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
         int ret = 0;
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
@@ -2311,12 +2320,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 
 static void serial8250_release_std_resource(struct uart_8250_port *up)
 {
-        unsigned int size = 8 << up->port.regshift;
+        unsigned int size = serial8250_port_size(up);
 
         switch (up->port.iotype) {
         case UPIO_AU:
-                size = 0x100000;
-                /* fall thru */
         case UPIO_TSI:
         case UPIO_MEM32:
         case UPIO_MEM:
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index 9d2186fd74aa..454a2712e629 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -119,12 +119,14 @@ struct omap2_mcspi {
         struct clk              *fck;
         /* Virtual base address of the controller */
         void __iomem            *base;
+        unsigned long           phys;
         /* SPI1 has 4 channels, while SPI2 has 2 */
         struct omap2_mcspi_dma  *dma_channels;
 };
 
 struct omap2_mcspi_cs {
         void __iomem            *base;
+        unsigned long           phys;
         int                     word_len;
 };
 
@@ -233,7 +235,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer)
         c = count;
         word_len = cs->word_len;
 
-        base = (unsigned long) io_v2p(cs->base);
+        base = cs->phys;
         tx_reg = base + OMAP2_MCSPI_TX0;
         rx_reg = base + OMAP2_MCSPI_RX0;
         rx = xfer->rx_buf;
@@ -633,6 +635,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                 if (!cs)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
+                cs->phys = mcspi->phys + spi->chip_select * 0x14;
                 spi->controller_state = cs;
         }
 
@@ -1005,7 +1008,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        mcspi->base = (void __iomem *) io_p2v(r->start);
+        mcspi->phys = r->start;
+        mcspi->base = ioremap(r->start, r->end - r->start + 1);
+        if (!mcspi->base) {
+                dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");
+                status = -ENOMEM;
+                goto err1aa;
+        }
 
         INIT_WORK(&mcspi->work, omap2_mcspi_work);
 
@@ -1055,6 +1064,8 @@ err3:
 err2:
         clk_put(mcspi->ick);
 err1a:
+        iounmap(mcspi->base);
+err1aa:
         release_mem_region(r->start, (r->end - r->start) + 1);
 err1:
         spi_master_put(master);
@@ -1067,6 +1078,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)
         struct omap2_mcspi      *mcspi;
         struct omap2_mcspi_dma  *dma_channels;
         struct resource         *r;
+        void __iomem *base;
 
         master = dev_get_drvdata(&pdev->dev);
         mcspi = spi_master_get_devdata(master);
@@ -1078,7 +1090,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(r->start, (r->end - r->start) + 1);
 
+        base = mcspi->base;
         spi_unregister_master(master);
+        iounmap(base);
         kfree(dma_channels);
 
         return 0;
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 5515eb97d7c5..bab6ff061e91 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -59,7 +59,6 @@
  * and irqs should show there too...
  */
 #define UWIRE_BASE_PHYS         0xFFFB3000
-#define UWIRE_BASE              ((void *__iomem)IO_ADDRESS(UWIRE_BASE_PHYS))
 
 /* uWire Registers: */
 #define UWIRE_IO_SIZE 0x20
@@ -103,16 +102,21 @@ struct uwire_state {
 };
 
 /* REVISIT compile time constant for idx_shift? */
+/*
+ * Or, put it in a structure which is used throughout the driver;
+ * that avoids having to issue two loads for each bit of static data.
+ */
 static unsigned int uwire_idx_shift;
+static void __iomem *uwire_base;
 
 static inline void uwire_write_reg(int idx, u16 val)
 {
-        __raw_writew(val, UWIRE_BASE + (idx << uwire_idx_shift));
+        __raw_writew(val, uwire_base + (idx << uwire_idx_shift));
 }
 
 static inline u16 uwire_read_reg(int idx)
 {
-        return __raw_readw(UWIRE_BASE + (idx << uwire_idx_shift));
+        return __raw_readw(uwire_base + (idx << uwire_idx_shift));
 }
 
 static inline void omap_uwire_configure_mode(u8 cs, unsigned long flags)
@@ -492,6 +496,14 @@ static int __init uwire_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         uwire = spi_master_get_devdata(master);
+
+        uwire_base = ioremap(UWIRE_BASE_PHYS, UWIRE_IO_SIZE);
+        if (!uwire_base) {
+                dev_dbg(&pdev->dev, "can't ioremap UWIRE\n");
+                spi_master_put(master);
+                return -ENOMEM;
+        }
+
         dev_set_drvdata(&pdev->dev, uwire);
 
         uwire->ck = clk_get(&pdev->dev, "armxor_ck");
@@ -520,8 +532,10 @@ static int __init uwire_probe(struct platform_device *pdev)
         uwire->bitbang.txrx_bufs = uwire_txrx;
 
         status = spi_bitbang_start(&uwire->bitbang);
-        if (status < 0)
+        if (status < 0) {
                 uwire_off(uwire);
+                iounmap(uwire_base);
+        }
         return status;
 }
 
@@ -534,6 +548,7 @@ static int __exit uwire_remove(struct platform_device *pdev)
 
         status = spi_bitbang_stop(&uwire->bitbang);
         uwire_off(uwire);
+        iounmap(uwire_base);
         return status;
 }
 
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 95b3ec89c126..522185629624 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -344,7 +344,12 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
                 goto err1;
         }
 
-        hcd->regs = (void __iomem *) (int) IO_ADDRESS(hcd->rsrc_start);
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (!hcd->regs) {
+                dev_err(&pdev->dev, "can't ioremap OHCI HCD\n");
+                retval = -ENOMEM;
+                goto err2;
+        }
 
         ohci = hcd_to_ohci(hcd);
         ohci_hcd_init(ohci);
@@ -355,11 +360,11 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
         irq = platform_get_irq(pdev, 0);
         if (irq < 0) {
                 retval = -ENXIO;
-                goto err2;
+                goto err3;
         }
         retval = usb_add_hcd(hcd, irq, IRQF_DISABLED);
         if (retval)
-                goto err2;
+                goto err3;
 
         host_initialized = 1;
 
@@ -367,6 +372,8 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
                 omap_ohci_clock_power(0);
 
         return 0;
+err3:
+        iounmap(hcd->regs);
 err2:
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err1:
@@ -401,6 +408,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
         }
         if (machine_is_omap_osk())
                 omap_free_gpio(9);
+        iounmap(hcd->regs);
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
         clk_put(usb_dc_ck);
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 6efcf89e7fbe..dfb72f5e4c96 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -156,7 +156,7 @@ struct resmap {
 };
 
 static struct {
-        u32             base;
+        void __iomem    *base;
 
         struct omapfb_mem_desc  mem_desc;
         struct resmap           *res_map[DISPC_MEMTYPE_NUM];
@@ -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_p2v(RFBI_CONTROL));
+        l = __raw_readl(IO_ADDRESS(RFBI_CONTROL));
         l |= enable ? 0 : (1 << 1);
-        __raw_writel(l, io_p2v(RFBI_CONTROL));
+        __raw_writel(l, IO_ADDRESS(RFBI_CONTROL));
 }
 
 static void set_lcd_data_lines(int data_lines)
@@ -1349,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,
 
         memset(&dispc, 0, sizeof(dispc));
 
-        dispc.base = io_p2v(DISPC_BASE);
+        dispc.base = ioremap(DISPC_BASE, SZ_1K);
+        if (!dispc.base) {
+                dev_err(fbdev->dev, "can't ioremap DISPC\n");
+                return -ENOMEM;
+        }
+
         dispc.fbdev = fbdev;
         dispc.ext_mode = ext_mode;
 
         init_completion(&dispc.frame_done);
 
         if ((r = get_dss_clocks()) < 0)
-                return r;
+                goto fail0;
 
         enable_interface_clocks(1);
         enable_lcd_clocks(1);
@@ -1414,7 +1419,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_p2v(0x680050a0));
+        __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0));
 
         if ((r = alloc_palette_ram()) < 0)
                 goto fail2;
@@ -1464,7 +1469,8 @@ fail1:
         enable_lcd_clocks(0);
         enable_interface_clocks(0);
         put_dss_clocks();
-
+fail0:
+        iounmap(dispc.base);
         return r;
 }
 
@@ -1481,6 +1487,7 @@ static void omap_dispc_cleanup(void)
         free_irq(INT_24XX_DSS_IRQ, dispc.fbdev);
         enable_interface_clocks(0);
         put_dss_clocks();
+        iounmap(dispc.base);
 }
 
 const struct lcd_ctrl omap2_int_ctrl = {
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h
index eb1512b56ce8..ef720a78f6d5 100644
--- a/drivers/video/omap/dispc.h
+++ b/drivers/video/omap/dispc.h
@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable);
 extern int  omap_dispc_request_irq(void (*callback)(void *data), void *data);
 extern void omap_dispc_free_irq(void);
 
+extern const struct lcd_ctrl omap2_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index 88c19d424ef7..6ff56430341b 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel)
         return 0;
 }
 
-struct lcd_panel h4_panel = {
+static struct lcd_panel h4_panel = {
         .name           = "h4",
         .config         = OMAP_LCDC_PANEL_TFT,
 
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev)
         return 0;
 }
 
-struct platform_driver h4_panel_driver = {
+static struct platform_driver h4_panel_driver = {
         .probe          = h4_panel_probe,
         .remove         = h4_panel_remove,
         .suspend        = h4_panel_suspend,
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 83514f066712..6e2ea7518761 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -34,6 +34,8 @@
 
 #include <asm/mach-types.h>
 
+#include "lcdc.h"
+
 #define MODULE_NAME                     "lcdc"
 
 #define OMAP_LCDC_BASE                  0xfffec000
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h
index adb731e5314a..845222270db3 100644
--- a/drivers/video/omap/lcdc.h
+++ b/drivers/video/omap/lcdc.h
@@ -4,4 +4,6 @@
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data);
 void omap_lcdc_free_dma_callback(void);
 
+extern const struct lcd_ctrl omap1_int_ctrl;
+
 #endif
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 51a138bd113c..5a5e407dc45f 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -31,11 +31,14 @@
 #include <mach/dma.h>
 #include <mach/omapfb.h>
 
+#include "lcdc.h"
+#include "dispc.h"
+
 #define MODULE_NAME     "omapfb"
 
 static unsigned int     def_accel;
 static unsigned long    def_vram[OMAPFB_PLANE_NUM];
-static int              def_vram_cnt;
+static unsigned int     def_vram_cnt;
 static unsigned long    def_vxres;
 static unsigned long    def_vyres;
 static unsigned int     def_rotate;
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = {
  * LCD panel
  * ---------------------------------------------------------------------------
  */
-extern struct lcd_ctrl omap1_int_ctrl;
-extern struct lcd_ctrl omap2_int_ctrl;
 extern struct lcd_ctrl hwa742_ctrl;
 extern struct lcd_ctrl blizzard_ctrl;
 
-static struct lcd_ctrl *ctrls[] = {
+static const struct lcd_ctrl *ctrls[] = {
 #ifdef CONFIG_ARCH_OMAP1
         &omap1_int_ctrl,
 #else
@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi,
         int ret;
 
         omapfb_rqueue_lock(plane->fbdev);
-        ret = omapfb_update_window_async(fbi, win, NULL, 0);
+        ret = omapfb_update_window_async(fbi, win, NULL, NULL);
         omapfb_rqueue_unlock(plane->fbdev);
 
         return ret;
@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi)
         win.format = 0;
 
         omapfb_rqueue_lock(fbdev);
-        r = fbdev->ctrl->update_window(fbi, &win, NULL, 0);
+        r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL);
         omapfb_rqueue_unlock(fbdev);
 
         return r;
@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval)
                 win.height = 2;
                 win.out_width = 2;
                 win.out_height = 2;
-                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0);
+                fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL);
         }
         omapfb_rqueue_unlock(fbdev);
 }
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 4a6f13d3facf..a13c8dcad2a8 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -59,7 +59,7 @@
 #define DISPC_CONTROL           0x0040
 
 static struct {
-        u32             base;
+        void __iomem    *base;
         void            (*lcdc_callback)(void *data);
         void            *lcdc_callback_data;
         unsigned long   l4_khz;
@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev)
         int r;
 
         rfbi.fbdev = fbdev;
-        rfbi.base = io_p2v(RFBI_BASE);
+        rfbi.base = ioremap(RFBI_BASE, SZ_1K);
+        if (!rfbi.base) {
+                dev_err(fbdev->dev, "can't ioremap RFBI\n");
+                return -ENOMEM;
+        }
 
         if ((r = rfbi_get_clocks()) < 0)
                 return r;
@@ -566,6 +570,7 @@ static void rfbi_cleanup(void)
 {
         omap_dispc_free_irq();
         rfbi_put_clocks();
+        iounmap(rfbi.base);
 }
 
 const struct lcd_ctrl_extif omap2_ext_if = {
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 6359353c2c67..a76946220249 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev)
         struct clk *dpll1out_ck;
         int r;
 
-        sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE);
+        sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K);
+        if (!sossi.base) {
+                dev_err(fbdev->dev, "can't ioremap SoSSI\n");
+                return -ENOMEM;
+        }
+
         sossi.fbdev = fbdev;
         spin_lock_init(&sossi.lock);
 
@@ -665,6 +670,7 @@ static void sossi_cleanup(void)
 {
         omap_lcdc_free_dma_callback();
         clk_put(sossi.fck);
+        iounmap(sossi.base);
 }
 
 struct lcd_ctrl_extif omap1_ext_if = {