arm: omap: board-cm-t35: use generic dpi panel's gpio handling

The cm-t35 board file currently requests gpios required to configure the tdo35s
panel, and provides platform_enable/disable callbacks to configure them.

These tasks have been moved to the generic dpi panel driver itself and shouldn't
be done in the board files.

Remove the gpio requests and the platform callbacks from the board file.
Add the gpio information to generic dpi panel's platform data so that it's
passed to the panel driver.

Note: Only BL enable gpio is handled in the panel driver. The LCD enable
GPIO is handled in the board file at init time, as there's a 50 ms delay
required when using the GPIO, and the panel driver doesn't know about
that.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

1 files changed, 9 insertions, 40 deletions

diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index bccd3e51fecb..cccbfea2fab3 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -190,32 +190,6 @@ static inline void cm_t35_init_nand(void) {}
 #define CM_T35_LCD_BL_GPIO 58
 #define CM_T35_DVI_EN_GPIO 54
 
-static int lcd_enabled;
-static int dvi_enabled;
-
-static int cm_t35_panel_enable_lcd(struct omap_dss_device *dssdev)
-{
-        if (dvi_enabled) {
-                printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
-                return -EINVAL;
-        }
-
-        gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
-        gpio_set_value(CM_T35_LCD_BL_GPIO, 1);
-
-        lcd_enabled = 1;
-
-        return 0;
-}
-
-static void cm_t35_panel_disable_lcd(struct omap_dss_device *dssdev)
-{
-        lcd_enabled = 0;
-
-        gpio_set_value(CM_T35_LCD_BL_GPIO, 0);
-        gpio_set_value(CM_T35_LCD_EN_GPIO, 0);
-}
-
 static int cm_t35_panel_enable_tv(struct omap_dss_device *dssdev)
 {
         return 0;
@@ -227,8 +201,10 @@ static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev)
 
 static struct panel_generic_dpi_data lcd_panel = {
         .name                   = "toppoly_tdo35s",
-        .platform_enable        = cm_t35_panel_enable_lcd,
-        .platform_disable       = cm_t35_panel_disable_lcd,
+        .num_gpios              = 1,
+        .gpios                  = {
+                CM_T35_LCD_BL_GPIO,
+        },
 };
 
 static struct omap_dss_device cm_t35_lcd_device = {
@@ -292,11 +268,6 @@ static struct spi_board_info cm_t35_lcd_spi_board_info[] __initdata = {
         },
 };
 
-static struct gpio cm_t35_dss_gpios[] __initdata = {
-        { CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW,  "lcd enable"    },
-        { CM_T35_LCD_BL_GPIO, GPIOF_OUT_INIT_LOW,  "lcd bl enable" },
-};
-
 static void __init cm_t35_init_display(void)
 {
         int err;
@@ -304,23 +275,21 @@ static void __init cm_t35_init_display(void)
         spi_register_board_info(cm_t35_lcd_spi_board_info,
                                 ARRAY_SIZE(cm_t35_lcd_spi_board_info));
 
-        err = gpio_request_array(cm_t35_dss_gpios,
-                                 ARRAY_SIZE(cm_t35_dss_gpios));
+
+        err = gpio_request_one(CM_T35_LCD_EN_GPIO, GPIOF_OUT_INIT_LOW,
+                        "lcd bl enable");
         if (err) {
-                pr_err("CM-T35: failed to request DSS control GPIOs\n");
+                pr_err("CM-T35: failed to request LCD EN GPIO\n");
                 return;
         }
 
-        gpio_export(CM_T35_LCD_EN_GPIO, 0);
-        gpio_export(CM_T35_LCD_BL_GPIO, 0);
-
         msleep(50);
         gpio_set_value(CM_T35_LCD_EN_GPIO, 1);
 
         err = omap_display_init(&cm_t35_dss_data);
         if (err) {
                 pr_err("CM-T35: failed to register DSS device\n");
-                gpio_free_array(cm_t35_dss_gpios, ARRAY_SIZE(cm_t35_dss_gpios));
+                gpio_free(CM_T35_LCD_EN_GPIO);
         }
 }