1 files changed, 2 insertions, 21 deletions

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 458f77bc473d..6dfb96cea293 100644
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -15,9 +15,9 @@
 #include <linux/spi/spi.h>
 #include <linux/mutex.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 
-#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
+#include "../dss/omapdss.h"
 
 static struct omap_video_timings lb035q02_timings = {
         .x_res = 320,
@@ -50,9 +50,6 @@ struct panel_drv_data {
 
         struct omap_video_timings videomode;
 
-        /* used for non-DT boot, to be removed */
-        int backlight_gpio;
-
         struct gpio_desc *enable_gpio;
 };
 
@@ -170,9 +167,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev)
         if (ddata->enable_gpio)
                 gpiod_set_value_cansleep(ddata->enable_gpio, 1);
 
-        if (gpio_is_valid(ddata->backlight_gpio))
-                gpio_set_value_cansleep(ddata->backlight_gpio, 1);
-
         dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
 
         return 0;
@@ -189,9 +183,6 @@ static void lb035q02_disable(struct omap_dss_device *dssdev)
         if (ddata->enable_gpio)
                 gpiod_set_value_cansleep(ddata->enable_gpio, 0);
 
-        if (gpio_is_valid(ddata->backlight_gpio))
-                gpio_set_value_cansleep(ddata->backlight_gpio, 0);
-
         in->ops.dpi->disable(in);
 
         dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
@@ -255,8 +246,6 @@ static int lb035q02_probe_of(struct spi_device *spi)
 
         ddata->enable_gpio = gpio;
 
-        ddata->backlight_gpio = -ENOENT;
-
         in = omapdss_of_find_source_for_first_ep(node);
         if (IS_ERR(in)) {
                 dev_err(&spi->dev, "failed to find video source\n");
@@ -289,13 +278,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         if (r)
                 return r;
 
-        if (gpio_is_valid(ddata->backlight_gpio)) {
-                r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
-                                GPIOF_OUT_INIT_LOW, "panel backlight");
-                if (r)
-                        goto err_gpio;
-        }
-
         ddata->videomode = lb035q02_timings;
 
         dssdev = &ddata->dssdev;
@@ -315,7 +297,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
         return 0;
 
 err_reg:
-err_gpio:
         omap_dss_put_device(ddata->in);
         return r;
 }