aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-18 04:33:44 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-07-25 03:08:16 -0400
commit19077a736148360b8510fa3a45f919d1a6354b06 (patch)
tree6b9bd2415fe79aecfccc82a7584625518ad384c7 /drivers/video/omap2
parent700dee78dcf7665ca63122049793a96f05d4b3e3 (diff)
OMAP: DSS2: DPI: remove unneeded SYSCK enable/disable
DSI PLL requires sys_clk to function, and DPI enables sys_clk when it wants to use DSI PLL. However, DSI PLL code already handles enabling sys_clk, so DPI's sys_clk code is extra. Remove the unneeded sys_clk handling from dpi.c. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/dpi.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index ff6bd30132df..bab55cd4ac9a 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -202,15 +202,14 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
202 goto err2; 202 goto err2;
203 203
204 if (dpi_use_dsi_pll(dssdev)) { 204 if (dpi_use_dsi_pll(dssdev)) {
205 dss_clk_enable(DSS_CLK_SYSCK);
206 r = dsi_pll_init(dpi.dsidev, 0, 1); 205 r = dsi_pll_init(dpi.dsidev, 0, 1);
207 if (r) 206 if (r)
208 goto err3; 207 goto err2;
209 } 208 }
210 209
211 r = dpi_set_mode(dssdev); 210 r = dpi_set_mode(dssdev);
212 if (r) 211 if (r)
213 goto err4; 212 goto err3;
214 213
215 mdelay(2); 214 mdelay(2);
216 215
@@ -218,12 +217,9 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
218 217
219 return 0; 218 return 0;
220 219
221err4:
222 if (dpi_use_dsi_pll(dssdev))
223 dsi_pll_uninit(dpi.dsidev, true);
224err3: 220err3:
225 if (dpi_use_dsi_pll(dssdev)) 221 if (dpi_use_dsi_pll(dssdev))
226 dss_clk_disable(DSS_CLK_SYSCK); 222 dsi_pll_uninit(dpi.dsidev, true);
227err2: 223err2:
228 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); 224 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
229 if (cpu_is_omap34xx()) 225 if (cpu_is_omap34xx())
@@ -242,7 +238,6 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
242 if (dpi_use_dsi_pll(dssdev)) { 238 if (dpi_use_dsi_pll(dssdev)) {
243 dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK); 239 dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
244 dsi_pll_uninit(dpi.dsidev, true); 240 dsi_pll_uninit(dpi.dsidev, true);
245 dss_clk_disable(DSS_CLK_SYSCK);
246 } 241 }
247 242
248 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); 243 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);