ARM: OMAP: Switch OMAP LCD panels to use gpio_request/free calls

[linux-2.6-omap-h63xx.git] / drivers / video / omap / lcd_omap2evm.c

diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
index 424fbae953c586043cb1f16fd6d3f0f6abc93bc5..2fc46c2bd77d7aad004c40ba40d096f064ebd54e 100644 (file)
--- a/drivers/video/omap/lcd_omap2evm.c
+++ b/drivers/video/omap/lcd_omap2evm.c
@@ -23,9 +23,9 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>
 #include <linux/i2c/twl4030.h>
 
-#include <mach/gpio.h>
 #include <mach/mux.h>
 #include <mach/omapfb.h>
 #include <asm/mach-types.h>
@@ -50,12 +50,12 @@ static unsigned int bklight_level;
 static int omap2evm_panel_init(struct lcd_panel *panel,
                                struct omapfb_device *fbdev)
 {
-       omap_request_gpio(LCD_PANEL_ENABLE_GPIO);
-       omap_request_gpio(LCD_PANEL_LR);
-       omap_request_gpio(LCD_PANEL_UD);
-       omap_request_gpio(LCD_PANEL_INI);
-       omap_request_gpio(LCD_PANEL_QVGA);
-       omap_request_gpio(LCD_PANEL_RESB);
+       gpio_request(LCD_PANEL_ENABLE_GPIO, "LCD enable");
+       gpio_request(LCD_PANEL_LR, "LCD lr");
+       gpio_request(LCD_PANEL_UD, "LCD ud");
+       gpio_request(LCD_PANEL_INI, "LCD ini");
+       gpio_request(LCD_PANEL_QVGA, "LCD qvga");
+       gpio_request(LCD_PANEL_RESB, "LCD resb");
 
        gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);
        gpio_direction_output(LCD_PANEL_RESB, 1);