diff options
| author | Mayuresh Janorkar <mayur@ti.com> | 2010-08-18 19:06:57 +0530 |
|---|---|---|
| committer | Samreen <samreen@ti.com> | 2010-08-19 18:09:14 +0530 |
| commit | 40e5501bfbf98349c52e89dbb5aea658744046f0 (patch) | |
| tree | 1d994f03e5644d8b293dec87c77f45da511e2efc /drivers | |
| parent | 6bc8355ae4eb56e738ea15ee7e53774fad57dc97 (diff) | |
DPI HWMOD change for USE_DSI_PLL
Fix Compilation error after enabling CONFIG_OMAP2_DSS_USE_DSI_PLL
Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 4dfa4db254cb..cfa80e05c087 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -39,7 +39,6 @@ static struct { struct regulator *vdds_dsi_reg; } dpi; -#ifdef HWMOD #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL static int dpi_set_dsi_clk(enum omap_channel channel, bool is_tft, unsigned long pck_req, unsigned long *fck, int *lck_div, @@ -65,11 +64,11 @@ static int dpi_set_dsi_clk(enum omap_channel channel, bool is_tft, dsi_cinfo.highfreq = 0; dsi_calc_clock_rates(&dsi_cinfo); } - r = dsi_pll_set_clock_div(lcd_channel_ix, &dsi_cinfo); + r = dsi_pll_set_clock_div(channel, &dsi_cinfo); if (r) return r; - dss_select_dispc_clk_source(lcd_channel_ix, DSS_SRC_DSI1_PLL_FCLK); + dss_select_dispc_clk_source(channel, DSS_SRC_DSI1_PLL_FCLK); r = dispc_set_clock_div(channel, &dispc_cinfo); if (r) @@ -81,7 +80,6 @@ static int dpi_set_dsi_clk(enum omap_channel channel, bool is_tft, return 0; } -#endif #else static int dpi_set_dispc_clk(enum omap_channel channel, bool is_tft, unsigned long pck_req, unsigned long *fck, int *lck_div, |