OMAPDSS: lb035q02: handle gpios in panel driver

The lgphilips panel driver leaves gpio configurations to the platform_enable
and disable calls in the platform's board file. These should happen in the
panel driver itself.

Use the platform data as defined for generic dpi panels to pass gpio information
to the lgphilips driver.

This will help in removing the need for the panel drivers to have platform
related callbacks.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index 8effea8f2259b5c89610520d1b476fd7eb024d93..63cd8857005508d8c4d2826d3f9aa51ae21287d0 100644 (file)
--- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
@@ -20,8 +20,10 @@
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/mutex.h>
+#include <linux/gpio.h>
 
 #include <video/omapdss.h>
+#include <video/omap-panel-data.h>
 
 struct lb035q02_data {
        struct mutex lock;
@@ -48,9 +50,16 @@ static struct omap_video_timings lb035q02_timings = {
        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
 };
 
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+       return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
 static int lb035q02_panel_power_on(struct omap_dss_device *dssdev)
 {
-       int r;
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+       int r, i;
 
        if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
                return 0;
@@ -68,6 +77,11 @@ static int lb035q02_panel_power_on(struct omap_dss_device *dssdev)
                        goto err1;
        }
 
+       for (i = 0; i < panel_data->num_gpios; ++i) {
+               gpio_set_value_cansleep(panel_data->gpios[i],
+                               panel_data->gpio_invert[i] ? 0 : 1);
+       }
+
        return 0;
 err1:
        omapdss_dpi_display_disable(dssdev);
@@ -77,9 +91,17 @@ err0:
 
 static void lb035q02_panel_power_off(struct omap_dss_device *dssdev)
 {
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+       int i;
+
        if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
                return;
 
+       for (i = panel_data->num_gpios - 1; i >= 0; --i) {
+               gpio_set_value_cansleep(panel_data->gpios[i],
+                               panel_data->gpio_invert[i] ? 1 : 0);
+       }
+
        if (dssdev->platform_disable)
                dssdev->platform_disable(dssdev);
 
@@ -88,7 +110,12 @@ static void lb035q02_panel_power_off(struct omap_dss_device *dssdev)
 
 static int lb035q02_panel_probe(struct omap_dss_device *dssdev)
 {
+       struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
        struct lb035q02_data *ld;
+       int r, i;
+
+       if (!panel_data)
+               return -EINVAL;
 
        dssdev->panel.timings = lb035q02_timings;
 
@@ -96,6 +123,15 @@ static int lb035q02_panel_probe(struct omap_dss_device *dssdev)
        if (!ld)
                return -ENOMEM;
 
+       for (i = 0; i < panel_data->num_gpios; ++i) {
+               r = devm_gpio_request_one(&dssdev->dev, panel_data->gpios[i],
+                               panel_data->gpio_invert[i] ?
+                               GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+                               "panel gpio");
+               if (r)
+                       return r;
+       }
+
        mutex_init(&ld->lock);
        dev_set_drvdata(&dssdev->dev, ld);