11 files changed, 105 insertions, 89 deletions

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/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 6a42c6a0cd99..4c4f7ee6d733 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -32,43 +32,43 @@ static int innovator1610_panel_init(struct lcd_panel *panel,
 {
         int r = 0;
 
-        if (omap_request_gpio(14)) {
+        if (gpio_request(14, "lcd_en0")) {
                 pr_err(MODULE_NAME ": can't request GPIO 14\n");
                 r = -1;
                 goto exit;
         }
-        if (omap_request_gpio(15)) {
+        if (gpio_request(15, "lcd_en1")) {
                 pr_err(MODULE_NAME ": can't request GPIO 15\n");
-                omap_free_gpio(14);
+                gpio_free(14);
                 r = -1;
                 goto exit;
         }
         /* configure GPIO(14, 15) as outputs */
-        omap_set_gpio_direction(14, 0);
-        omap_set_gpio_direction(15, 0);
+        gpio_direction_output(14, 0);
+        gpio_direction_output(15, 0);
 exit:
         return r;
 }
 
 static void innovator1610_panel_cleanup(struct lcd_panel *panel)
 {
-        omap_free_gpio(15);
-        omap_free_gpio(14);
+        gpio_free(15);
+        gpio_free(14);
 }
 
 static int innovator1610_panel_enable(struct lcd_panel *panel)
 {
         /* set GPIO14 and GPIO15 high */
-        omap_set_gpio_dataout(14, 1);
-        omap_set_gpio_dataout(15, 1);
+        gpio_set_value(14, 1);
+        gpio_set_value(15, 1);
         return 0;
 }
 
 static void innovator1610_panel_disable(struct lcd_panel *panel)
 {
         /* set GPIO13, GPIO14 and GPIO15 low */
-        omap_set_gpio_dataout(14, 0);
-        omap_set_gpio_dataout(15, 0);
+        gpio_set_value(14, 0);
+        gpio_set_value(15, 0);
 }
 
 static unsigned long innovator1610_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index a4a725f427a4..379c96d36da5 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -29,6 +29,7 @@
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
 {
+        /* gpio2 was allocated in board init */
         return 0;
 }
 
@@ -47,11 +48,8 @@ static int osk_panel_enable(struct lcd_panel *panel)
         /* Set PWL level */
         omap_writeb(0xFF, OMAP_PWL_ENABLE);
 
-        /* configure GPIO2 as output */
-        omap_set_gpio_direction(2, 0);
-
-        /* set GPIO2 high */
-        omap_set_gpio_dataout(2, 1);
+        /* set GPIO2 high (lcd power enabled) */
+        gpio_set_value(2, 1);
 
         return 0;
 }
@@ -65,7 +63,7 @@ static void osk_panel_disable(struct lcd_panel *panel)
         omap_writeb(0x00, OMAP_PWL_CLK_ENABLE);
 
         /* set GPIO2 low */
-        omap_set_gpio_dataout(2, 0);
+        gpio_set_value(2, 0);
 }
 
 static unsigned long osk_panel_get_caps(struct lcd_panel *panel)
diff --git a/drivers/video/omap/lcd_sx1.c b/drivers/video/omap/lcd_sx1.c
index caa6a896cb8b..e55de201b8ff 100644
--- a/drivers/video/omap/lcd_sx1.c
+++ b/drivers/video/omap/lcd_sx1.c
@@ -81,21 +81,21 @@ static void epson_sendbyte(int flag, unsigned char byte)
         int i, shifter = 0x80;
 
         if (!flag)
-                omap_set_gpio_dataout(_A_LCD_SSC_A0, 0);
+                gpio_set_value(_A_LCD_SSC_A0, 0);
         mdelay(2);
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
+        gpio_set_value(A_LCD_SSC_RD, 1);
 
-        omap_set_gpio_dataout(A_LCD_SSC_SD, flag);
+        gpio_set_value(A_LCD_SSC_SD, flag);
 
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
         OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
         for (i = 0; i < 8; i++) {
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2200);
-                omap_set_gpio_dataout(A_LCD_SSC_SD, shifter & byte);
+                gpio_set_value(A_LCD_SSC_SD, shifter & byte);
                 OMAP_MCBSP_WRITE(OMAP1510_MCBSP3_BASE, PCR0, 0x2202);
                 shifter >>= 1;
         }
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_set_value(_A_LCD_SSC_A0, 1);
 }
 
 static void init_system(void)
@@ -107,25 +107,18 @@ static void init_system(void)
 static void setup_GPIO(void)
 {
         /* new wave */
-        omap_request_gpio(A_LCD_SSC_RD);
-        omap_request_gpio(A_LCD_SSC_SD);
-        omap_request_gpio(_A_LCD_RESET);
-        omap_request_gpio(_A_LCD_SSC_CS);
-        omap_request_gpio(_A_LCD_SSC_A0);
-
-        /* set all GPIOs to output */
-        omap_set_gpio_direction(A_LCD_SSC_RD, 0);
-        omap_set_gpio_direction(A_LCD_SSC_SD, 0);
-        omap_set_gpio_direction(_A_LCD_RESET, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_CS, 0);
-        omap_set_gpio_direction(_A_LCD_SSC_A0, 0);
-
-        /* set GPIO data */
-        omap_set_gpio_dataout(A_LCD_SSC_RD, 1);
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 0);
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_A0, 1);
+        gpio_request(A_LCD_SSC_RD, "lcd_ssc_rd");
+        gpio_request(A_LCD_SSC_SD, "lcd_ssc_sd");
+        gpio_request(_A_LCD_RESET, "lcd_reset");
+        gpio_request(_A_LCD_SSC_CS, "lcd_ssc_cs");
+        gpio_request(_A_LCD_SSC_A0, "lcd_ssc_a0");
+
+        /* set GPIOs to output, with initial data */
+        gpio_direction_output(A_LCD_SSC_RD, 1);
+        gpio_direction_output(A_LCD_SSC_SD, 0);
+        gpio_direction_output(_A_LCD_RESET, 0);
+        gpio_direction_output(_A_LCD_SSC_CS, 1);
+        gpio_direction_output(_A_LCD_SSC_A0, 1);
 }
 
 static void display_init(void)
@@ -139,61 +132,61 @@ static void display_init(void)
         mdelay(2);
 
         /* reset LCD */
-        omap_set_gpio_dataout(A_LCD_SSC_SD, 1);
+        gpio_set_value(A_LCD_SSC_SD, 1);
         epson_sendbyte(0, 0x25);
 
-        omap_set_gpio_dataout(_A_LCD_RESET, 0);
+        gpio_set_value(_A_LCD_RESET, 0);
         mdelay(10);
-        omap_set_gpio_dataout(_A_LCD_RESET, 1);
+        gpio_set_value(_A_LCD_RESET, 1);
 
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(2);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD, phase 1 */
         epson_sendbyte(0, 0xCA);
         for (i = 0; i < 10; i++)
                 epson_sendbyte(1, INIT_1[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2 */
         epson_sendbyte(0, 0xCB);
         for (i = 0; i < 125; i++)
                 epson_sendbyte(1, INIT_2[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 2a */
         epson_sendbyte(0, 0xCC);
         for (i = 0; i < 14; i++)
                 epson_sendbyte(1, INIT_3[i]);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 3 */
         epson_sendbyte(0, 0xBC);
         epson_sendbyte(1, 0x08);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 4 */
         epson_sendbyte(0, 0x07);
         epson_sendbyte(1, 0x05);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 5 */
         epson_sendbyte(0, 0x94);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 6 */
         epson_sendbyte(0, 0xC6);
         epson_sendbyte(1, 0x80);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100); /* used to be 1000 */
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 7 */
         epson_sendbyte(0, 0x16);
@@ -201,8 +194,8 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xB1);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 8 */
         epson_sendbyte(0, 0x76);
@@ -210,12 +203,12 @@ static void display_init(void)
         epson_sendbyte(1, 0x00);
         epson_sendbyte(1, 0xDB);
         epson_sendbyte(1, 0x00);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         /* init LCD phase 9 */
         epson_sendbyte(0, 0xAF);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
@@ -231,18 +224,18 @@ static void sx1_panel_disable(struct lcd_panel *panel)
 {
         printk(KERN_INFO "SX1: LCD panel disable\n");
         sx1_setmmipower(0);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 
         epson_sendbyte(0, 0x25);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0xAE);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
         mdelay(100);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 0);
+        gpio_set_value(_A_LCD_SSC_CS, 0);
 
         epson_sendbyte(0, 0x95);
-        omap_set_gpio_dataout(_A_LCD_SSC_CS, 1);
+        gpio_set_value(_A_LCD_SSC_CS, 1);
 }
 
 static int sx1_panel_enable(struct lcd_panel *panel)
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 = {