1 files changed, 39 insertions, 19 deletions

diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index 6e5abe8fd2dd..4ea6548c0ae9 100644
--- 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;
@@ -62,54 +71,65 @@ static int lb035q02_panel_power_on(struct omap_dss_device *dssdev)
         if (r)
                 goto err0;
 
-        if (dssdev->platform_enable) {
-                r = dssdev->platform_enable(dssdev);
-                if (r)
-                        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);
+
 err0:
         return r;
 }
 
 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;
 
-        if (dssdev->platform_disable)
-                dssdev->platform_disable(dssdev);
+        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);
+        }
 
         omapdss_dpi_display_disable(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;
+        int r, i;
+
+        if (!panel_data)
+                return -EINVAL;
 
         dssdev->panel.timings = lb035q02_timings;
 
-        ld = kzalloc(sizeof(*ld), GFP_KERNEL);
-        if (!ld) {
-                r = -ENOMEM;
-                goto err;
+        ld = devm_kzalloc(&dssdev->dev, sizeof(*ld), GFP_KERNEL);
+        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);
+
         return 0;
-err:
-        return r;
 }
 
 static void lb035q02_panel_remove(struct omap_dss_device *dssdev)
 {
-        struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev);
-
-        kfree(ld);
 }
 
 static int lb035q02_panel_enable(struct omap_dss_device *dssdev)