OMAPDSS: n8x0 panel: handle gpio data in panel driver

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / video / omap2 / displays / panel-n8x0.c

diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index dd129475080297de33f239dfc903bb990fd373c5..c146a3d215e2d07662288281012651240ae37305 100644 (file)
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -5,11 +5,10 @@
 #include <linux/slab.h>
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
-#include <linux/backlight.h>
 #include <linux/fb.h>
 
 #include <video/omapdss.h>
-#include <video/omap-panel-n8x0.h>
+#include <video/omap-panel-data.h>
 
 #define BLIZZARD_REV_CODE                      0x00
 #define BLIZZARD_CONFIG                        0x02
@@ -69,7 +68,6 @@ static struct panel_drv_data {
 
        struct omap_dss_device *dssdev;
        struct spi_device *spidev;
-       struct backlight_device *bldev;
 
        int blizzard_ver;
 } s_drv_data;
@@ -424,54 +422,10 @@ static const struct rfbi_timings n8x0_panel_timings = {
        .cs_pulse_width = 0,
 };
 
-static int n8x0_bl_update_status(struct backlight_device *dev)
-{
-       struct omap_dss_device *dssdev = dev_get_drvdata(&dev->dev);
-       struct panel_n8x0_data *bdata = get_board_data(dssdev);
-       struct panel_drv_data *ddata = get_drv_data(dssdev);
-       int r;
-       int level;
-
-       mutex_lock(&ddata->lock);
-
-       if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-                       dev->props.power == FB_BLANK_UNBLANK)
-               level = dev->props.brightness;
-       else
-               level = 0;
-
-       dev_dbg(&dssdev->dev, "update brightness to %d\n", level);
-
-       if (!bdata->set_backlight)
-               r = -EINVAL;
-       else
-               r = bdata->set_backlight(dssdev, level);
-
-       mutex_unlock(&ddata->lock);
-
-       return r;
-}
-
-static int n8x0_bl_get_intensity(struct backlight_device *dev)
-{
-       if (dev->props.fb_blank == FB_BLANK_UNBLANK &&
-                       dev->props.power == FB_BLANK_UNBLANK)
-               return dev->props.brightness;
-
-       return 0;
-}
-
-static const struct backlight_ops n8x0_bl_ops = {
-       .get_brightness = n8x0_bl_get_intensity,
-       .update_status  = n8x0_bl_update_status,
-};
-
 static int n8x0_panel_probe(struct omap_dss_device *dssdev)
 {
        struct panel_n8x0_data *bdata = get_board_data(dssdev);
        struct panel_drv_data *ddata;
-       struct backlight_device *bldev;
-       struct backlight_properties props;
        int r;
 
        dev_dbg(&dssdev->dev, "probe\n");
@@ -491,40 +445,27 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev)
        dssdev->ctrl.rfbi_timings = n8x0_panel_timings;
        dssdev->caps = OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
 
-       memset(&props, 0, sizeof(props));
-       props.max_brightness = 127;
-       props.type = BACKLIGHT_PLATFORM;
-       bldev = backlight_device_register(dev_name(&dssdev->dev), &dssdev->dev,
-                       dssdev, &n8x0_bl_ops, &props);
-       if (IS_ERR(bldev)) {
-               r = PTR_ERR(bldev);
-               dev_err(&dssdev->dev, "register backlight failed\n");
-               return r;
+       if (gpio_is_valid(bdata->panel_reset)) {
+               r = devm_gpio_request_one(&dssdev->dev, bdata->panel_reset,
+                               GPIOF_OUT_INIT_LOW, "PANEL RESET");
+               if (r)
+                       return r;
        }
 
-       ddata->bldev = bldev;
-
-       bldev->props.fb_blank = FB_BLANK_UNBLANK;
-       bldev->props.power = FB_BLANK_UNBLANK;
-       bldev->props.brightness = 127;
-
-       n8x0_bl_update_status(bldev);
+       if (gpio_is_valid(bdata->ctrl_pwrdown)) {
+               r = devm_gpio_request_one(&dssdev->dev, bdata->ctrl_pwrdown,
+                               GPIOF_OUT_INIT_LOW, "PANEL PWRDOWN");
+               if (r)
+                       return r;
+       }
 
        return 0;
 }
 
 static void n8x0_panel_remove(struct omap_dss_device *dssdev)
 {
-       struct panel_drv_data *ddata = get_drv_data(dssdev);
-       struct backlight_device *bldev;
-
        dev_dbg(&dssdev->dev, "remove\n");
 
-       bldev = ddata->bldev;
-       bldev->props.power = FB_BLANK_POWERDOWN;
-       n8x0_bl_update_status(bldev);
-       backlight_device_unregister(bldev);
-
        dev_set_drvdata(&dssdev->dev, NULL);
 }