diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-18 11:33:44 +0300 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-10-10 15:07:02 +0200 |
| commit | 8984a28c3c149e5aa7a599bb59a305dce335214e (patch) | |
| tree | a3c4b762be4038c8f817b17eda2753e5249b569f /drivers | |
| parent | fcb053ad19b3d7c3af7949d153bed84cc06d24aa (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')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index c7acf5598479..81e8341ce05b 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -205,15 +205,14 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) goto err2; if (dpi_use_dsi_pll(dssdev)) { - dss_clk_enable(DSS_CLK_SYSCK); r = dsi_pll_init(dpi.dsidev, 0, 1); if (r) - goto err3; + goto err2; } r = dpi_set_mode(dssdev); if (r) - goto err4; + goto err3; mdelay(2); @@ -221,12 +220,9 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) return 0; -err4: - if (dpi_use_dsi_pll(dssdev)) - dsi_pll_uninit(dpi.dsidev, true); err3: if (dpi_use_dsi_pll(dssdev)) - dss_clk_disable(DSS_CLK_SYSCK); + dsi_pll_uninit(dpi.dsidev, true); err2: dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); if (cpu_is_omap34xx()) @@ -245,7 +241,6 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev) if (dpi_use_dsi_pll(dssdev)) { dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK); dsi_pll_uninit(dpi.dsidev, true); - dss_clk_disable(DSS_CLK_SYSCK); } dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK); |