aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/dpi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
-rw-r--r--drivers/video/omap2/dss/dpi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index c5091ed12a7d..77b95577ab30 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -194,7 +194,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
194 194
195 mdelay(2); 195 mdelay(2);
196 196
197 dispc_enable_lcd_out(1); 197 dssdev->manager->enable(dssdev->manager);
198 198
199 r = dssdev->driver->enable(dssdev); 199 r = dssdev->driver->enable(dssdev);
200 if (r) 200 if (r)
@@ -205,7 +205,7 @@ static int dpi_display_enable(struct omap_dss_device *dssdev)
205 return 0; 205 return 0;
206 206
207err6: 207err6:
208 dispc_enable_lcd_out(0); 208 dssdev->manager->disable(dssdev->manager);
209err5: 209err5:
210#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL 210#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
211 dsi_pll_uninit(); 211 dsi_pll_uninit();
@@ -235,7 +235,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev)
235 235
236 dssdev->driver->disable(dssdev); 236 dssdev->driver->disable(dssdev);
237 237
238 dispc_enable_lcd_out(0); 238 dssdev->manager->disable(dssdev->manager);
239 239
240#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL 240#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
241 dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK); 241 dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
@@ -263,7 +263,7 @@ static int dpi_display_suspend(struct omap_dss_device *dssdev)
263 if (dssdev->driver->suspend) 263 if (dssdev->driver->suspend)
264 dssdev->driver->suspend(dssdev); 264 dssdev->driver->suspend(dssdev);
265 265
266 dispc_enable_lcd_out(0); 266 dssdev->manager->disable(dssdev->manager);
267 267
268 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); 268 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
269 269
@@ -292,7 +292,7 @@ static int dpi_display_resume(struct omap_dss_device *dssdev)
292 292
293 dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1); 293 dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1);
294 294
295 dispc_enable_lcd_out(1); 295 dssdev->manager->enable(dssdev->manager);
296 296
297 if (dssdev->driver->resume) 297 if (dssdev->driver->resume)
298 dssdev->driver->resume(dssdev); 298 dssdev->driver->resume(dssdev);
@@ -383,10 +383,10 @@ static int dpi_display_set_update_mode(struct omap_dss_device *dssdev,
383 return -EINVAL; 383 return -EINVAL;
384 384
385 if (mode == OMAP_DSS_UPDATE_DISABLED) { 385 if (mode == OMAP_DSS_UPDATE_DISABLED) {
386 dispc_enable_lcd_out(0); 386 dssdev->manager->disable(dssdev->manager);
387 dpi.update_enabled = 0; 387 dpi.update_enabled = 0;
388 } else { 388 } else {
389 dispc_enable_lcd_out(1); 389 dssdev->manager->enable(dssdev->manager);
390 dpi.update_enabled = 1; 390 dpi.update_enabled = 1;
391 } 391 }
392 392