OMAP: DSS: Fix for dsi_pll to dpll4 clk switch

Commit Message

Nagarajan, Rajkumar June 17, 2010, 5:12 a.m. UTC

None

Patch

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 960e977..5d778d6 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -214,10 +214,15 @@  void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
 
 #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL
 	dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK);
+	dispc_go(OMAP_DSS_CHANNEL_LCD);
+	while	(dispc_go_busy(OMAP_DSS_CHANNEL_LCD))
+		;
 	dsi_pll_uninit();
 	dss_clk_disable(DSS_CLK_FCK2);
 #endif
 
+	dispc_enable_channel(OMAP_DSS_CHANNEL_LCD, 0);
+
 	dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
 
 	if (cpu_is_omap34xx())