diff options
| author | Archit Taneja <archit@ti.com> | 2012-08-08 16:56:06 +0530 |
|---|---|---|
| committer | Archit Taneja <archit@ti.com> | 2012-08-15 15:48:45 +0530 |
| commit | 9b4a5716ef54bbf2f57c75f790b12fc63a4be640 (patch) | |
| tree | fe864e4c6e6fbd2e32da6d4c305ad10cbde7d697 /drivers/video/omap2 | |
| parent | c7833f7bc049dfd844ce3042798cf48551b5f14d (diff) | |
| download | blackbird-op-linux-9b4a5716ef54bbf2f57c75f790b12fc63a4be640.tar.gz blackbird-op-linux-9b4a5716ef54bbf2f57c75f790b12fc63a4be640.zip | |
OMAPDSS: SDI: Maintain our own timings field in driver data
The SDI driver currently relies on the timings in omap_dss_device struct to
configure the DISPC accordingly. This makes the SDI interface driver dependent
on the omap_dss_device struct.
Make the SDI driver data maintain it's own timings field. The panel driver is
expected to call omapdss_sdi_set_timings() to set these timings before the panel
is enabled.
Make the SDI panel driver configure the new timings is the omap_dss_device
struct(dssdev->panel.timings). The SDI driver is responsible for maintaining
only it's own copy of timings.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2')
| -rw-r--r-- | drivers/video/omap2/displays/panel-acx565akm.c | 4 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/sdi.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c index 11bdc883e46b..77fe59f6a8cd 100644 --- a/drivers/video/omap2/displays/panel-acx565akm.c +++ b/drivers/video/omap2/displays/panel-acx565akm.c @@ -600,6 +600,8 @@ static int acx_panel_power_on(struct omap_dss_device *dssdev) mutex_lock(&md->mutex); + omapdss_sdi_set_timings(dssdev, &dssdev->panel.timings); + r = omapdss_sdi_display_enable(dssdev); if (r) { pr_err("%s sdi enable failed\n", __func__); @@ -732,6 +734,8 @@ static void acx_panel_set_timings(struct omap_dss_device *dssdev, struct omap_video_timings *timings) { omapdss_sdi_set_timings(dssdev, timings); + + dssdev->panel.timings = *timings; } static int acx_panel_check_timings(struct omap_dss_device *dssdev, diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index 0474962571c6..6ec6614009ed 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c @@ -34,6 +34,7 @@ static struct { struct regulator *vdds_sdi_reg; struct dss_lcd_mgr_config mgr_config; + struct omap_video_timings timings; } sdi; static void sdi_config_lcd_manager(struct omap_dss_device *dssdev) @@ -51,7 +52,7 @@ static void sdi_config_lcd_manager(struct omap_dss_device *dssdev) int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) { - struct omap_video_timings *t = &dssdev->panel.timings; + struct omap_video_timings *t = &sdi.timings; struct dss_clock_info dss_cinfo; struct dispc_clock_info dispc_cinfo; unsigned long pck; @@ -77,8 +78,8 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) goto err_get_dispc; /* 15.5.9.1.2 */ - dssdev->panel.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; - dssdev->panel.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; + t->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; + t->sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; r = dss_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo); if (r) @@ -151,7 +152,7 @@ void omapdss_sdi_set_timings(struct omap_dss_device *dssdev, { int r; - dssdev->panel.timings = *timings; + sdi.timings = *timings; if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) { omapdss_sdi_display_disable(dssdev); |
