Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e785091 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: DSS2: fix clock sources on error and uninit 



DPI and DSI were not cleaning up the clock source in error or uninit
cases. Set the clock source back to PRCM.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bab59b44

drivers/video/omap2/dss/dpi.c

+3 −1
Original line number Diff line number Diff line
@@ -83,8 +83,10 @@ static int dpi_set_dsi_clk(struct omap_dss_device *dssdev, bool is_tft, 
	dss_select_dispc_clk_source(dssdev->clocks.dispc.dispc_fclk_src);



	r = dispc_set_clock_div(dssdev->manager->id, &dispc_cinfo);

	if (r)

	if (r) {

		dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

		return r;

	}



	*fck = dsi_cinfo.dsi_pll_hsdiv_dispc_clk;

	*lck_div = dispc_cinfo.lck_div;

drivers/video/omap2/dss/dsi.c

+3 −0
Original line number Diff line number Diff line
@@ -4184,6 +4184,8 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) 
err2:

	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);



err1:

	dsi_pll_uninit(dsidev, true);

err0:
@@ -4209,6 +4211,7 @@ static void dsi_display_uninit_dsi(struct omap_dss_device *dssdev, 


	dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);

	dss_select_dsi_clk_source(dsi_module, OMAP_DSS_CLK_SRC_FCK);

	dss_select_lcd_clk_source(dssdev->manager->id, OMAP_DSS_CLK_SRC_FCK);

	dsi_cio_uninit(dssdev);

	dsi_pll_uninit(dsidev, disconnect_lanes);

}