Skip to content

Commit

Permalink
OMAPDSS: DSI remove unneeded clk source setup code
Browse files Browse the repository at this point in the history
We always use the same clock sources for DSI, so let's remove the
unnecessary clock source fields from dsi_data.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Apr 3, 2013
1 parent 478d7df commit 4ce9e33
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,6 @@ struct dsi_data {
struct dispc_clock_info user_dispc_cinfo;
struct dsi_clock_info user_dsi_cinfo;

enum omap_dss_clk_source user_dispc_fclk_src;
enum omap_dss_clk_source user_lcd_clk_src;
enum omap_dss_clk_source user_dsi_fclk_src;

struct dsi_clock_info current_cinfo;

bool vdds_dsi_enabled;
Expand Down Expand Up @@ -4327,18 +4323,6 @@ static int dsi_set_clocks(struct omap_dss_device *dssdev,
dsi->user_dispc_cinfo.lck_div = dispc_cinfo.lck_div;
dsi->user_dispc_cinfo.pck_div = dispc_cinfo.pck_div;

dsi->user_dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK;

dsi->user_lcd_clk_src =
dsi->module_id == 0 ?
OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;

dsi->user_dsi_fclk_src =
dsi->module_id == 0 ?
OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI;

return 0;
err:
return r;
Expand Down Expand Up @@ -4635,7 +4619,9 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
int r;

dss_select_lcd_clk_source(mgr->id, dsi->user_lcd_clk_src);
dss_select_lcd_clk_source(mgr->id, dsi->module_id == 0 ?
OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC);

if (dsi->mode == OMAP_DSS_DSI_CMD_MODE) {
dsi->timings.hsw = 1;
Expand Down Expand Up @@ -4741,7 +4727,9 @@ static int dsi_display_init_dsi(struct platform_device *dsidev)
if (r)
goto err1;

dss_select_dsi_clk_source(dsi->module_id, dsi->user_dsi_fclk_src);
dss_select_dsi_clk_source(dsi->module_id, dsi->module_id == 0 ?
OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI);

DSSDBG("PLL OK\n");

Expand Down

0 comments on commit 4ce9e33

Please sign in to comment.