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

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
index 99cd2dba9c8cda1518423c8af55f77b00111cdf8..a22b452c4d5e32f841b9f266e68e14664521aef5 100644 (file)
--- a/drivers/video/omap/lcd_2430sdp.c
+++ b/drivers/video/omap/lcd_2430sdp.c
@@ -24,9 +24,9 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/delay.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>
@@ -65,8 +65,8 @@ static int sdp2430_panel_init(struct lcd_panel *panel,
                backlight_gpio = SDP2430_LCD_PANEL_BACKLIGHT_GPIO;
        }
 
-       omap_request_gpio(enable_gpio);                 /* LCD panel */
-       omap_request_gpio(backlight_gpio);              /* LCD backlight */
+       gpio_request(enable_gpio, "LCD enable");        /* LCD panel */
+       gpio_request(backlight_gpio, "LCD bl");         /* LCD backlight */
        gpio_direction_output(enable_gpio, 0);
        gpio_direction_output(backlight_gpio, 0);
 

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);

diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
index 0c779e40d5edd218129a8f959c000ce6d7fb2476..eae43e4c2650c4d7414c6104c54688d850376136 100644 (file)
--- a/drivers/video/omap/lcd_omap3beagle.c
+++ b/drivers/video/omap/lcd_omap3beagle.c
@@ -22,9 +22,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>
@@ -38,7 +38,7 @@
 static int omap3beagle_panel_init(struct lcd_panel *panel,
                                struct omapfb_device *fbdev)
 {
-       omap_request_gpio(LCD_PANEL_ENABLE_GPIO);
+       gpio_request(LCD_PANEL_ENABLE_GPIO, "LCD enable");
        return 0;
 }
 

diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
index 90aa015499e8e8d8eb6299a7c11a991fd37aa326..1c3d814f9ff80131a1b12fed140ea1e4f41c26e4 100644 (file)
--- a/drivers/video/omap/lcd_omap3evm.c
+++ b/drivers/video/omap/lcd_omap3evm.c
@@ -22,9 +22,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>
@@ -54,11 +54,11 @@ static unsigned int bklight_level;
 static int omap3evm_panel_init(struct lcd_panel *panel,
                                struct omapfb_device *fbdev)
 {
-       omap_request_gpio(LCD_PANEL_LR);
-       omap_request_gpio(LCD_PANEL_UD);
-       omap_request_gpio(LCD_PANEL_INI);
-       omap_request_gpio(LCD_PANEL_RESB);
-       omap_request_gpio(LCD_PANEL_QVGA);
+       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_RESB, "LCD resb");
+       gpio_request(LCD_PANEL_QVGA, "LCD qvga");
 
        gpio_direction_output(LCD_PANEL_RESB, 1);
        gpio_direction_output(LCD_PANEL_INI, 1);