]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
OMAPDSS: n8x0 panel: handle gpio data in panel driver
authorArchit Taneja <archit@ti.com>
Wed, 21 Nov 2012 06:38:40 +0000 (12:08 +0530)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 3 Apr 2013 12:21:09 +0000 (15:21 +0300)
The n8x0 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.

A platform data struct called panel_n8x0_data already exists to hold gpio
numbers and other platform data. However, the gpio requests are expected to be
done in the board file and not the panel driver.

Request all the gpios in the panel driver so that the board files which use
the the panel don't need to do it. This will help in removing the need for the
panel drivers to have platform related callbacks.

Signed-off-by: Archit Taneja <archit@ti.com>
drivers/video/omap2/displays/panel-n8x0.c

index 9c55c91528639a3bf241d9161ab4418ee48e00f5..c146a3d215e2d07662288281012651240ae37305 100644 (file)
@@ -426,6 +426,7 @@ static int n8x0_panel_probe(struct omap_dss_device *dssdev)
 {
        struct panel_n8x0_data *bdata = get_board_data(dssdev);
        struct panel_drv_data *ddata;
+       int r;
 
        dev_dbg(&dssdev->dev, "probe\n");
 
@@ -444,6 +445,20 @@ 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;
 
+       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;
+       }
+
+       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;
 }