aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2013-02-12 04:41:42 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-03 08:21:09 -0400
commitaf9f6c35563079cb0ea9b429983914cd4e2c24f3 (patch)
tree3c62ad75f9b536d21b4e7e917af0b86aa52df180 /drivers/video
parent64f938974ee39686b017ebe4b6087aa55e2f0a82 (diff)
OMAPDSS: n8x0 panel: remove use of platform_enable/disable
The n8x0 panel driver now manages the gpios required to configure the panel. This was previously done in panel_n8x0_data's platform_enable/disable callbacks defined in board files using this panel. All the board files using this panel now pass the gpio information as platform data via the panel_n8x0_data struct, which is needed by the panel driver to configure the gpios connected to the panel. Hence, the uses of platform_enable/disable ops can be safely removed now. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/displays/panel-n8x0.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index c146a3d215e2..f94ead6a3183 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -295,12 +295,6 @@ static int n8x0_panel_power_on(struct omap_dss_device *dssdev)
295 295
296 gpio_direction_output(bdata->ctrl_pwrdown, 1); 296 gpio_direction_output(bdata->ctrl_pwrdown, 1);
297 297
298 if (bdata->platform_enable) {
299 r = bdata->platform_enable(dssdev);
300 if (r)
301 goto err_plat_en;
302 }
303
304 omapdss_rfbi_set_size(dssdev, dssdev->panel.timings.x_res, 298 omapdss_rfbi_set_size(dssdev, dssdev->panel.timings.x_res,
305 dssdev->panel.timings.y_res); 299 dssdev->panel.timings.y_res);
306 omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size); 300 omapdss_rfbi_set_pixel_size(dssdev, dssdev->ctrl.pixel_size);
@@ -373,9 +367,6 @@ err_inv_panel:
373err_inv_chip: 367err_inv_chip:
374 omapdss_rfbi_display_disable(dssdev); 368 omapdss_rfbi_display_disable(dssdev);
375err_rfbi_en: 369err_rfbi_en:
376 if (bdata->platform_disable)
377 bdata->platform_disable(dssdev);
378err_plat_en:
379 gpio_direction_output(bdata->ctrl_pwrdown, 0); 370 gpio_direction_output(bdata->ctrl_pwrdown, 0);
380 return r; 371 return r;
381} 372}
@@ -392,9 +383,6 @@ static void n8x0_panel_power_off(struct omap_dss_device *dssdev)
392 send_display_off(spi); 383 send_display_off(spi);
393 send_sleep_in(spi); 384 send_sleep_in(spi);
394 385
395 if (bdata->platform_disable)
396 bdata->platform_disable(dssdev);
397
398 /* 386 /*
399 * HACK: we should turn off the panel here, but there is some problem 387 * HACK: we should turn off the panel here, but there is some problem
400 * with the initialization sequence, and we fail to init the panel if we 388 * with the initialization sequence, and we fail to init the panel if we