aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2011-05-12 07:56:25 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-12 12:30:26 -0400
commit41e03d15977978cdf8a5936f30ceb6088dda157a (patch)
treec453d7aef454f4b603031bbeb4121e73b47f50ac
parent1ffefe755c2681752a10ae50b2b17e70147bb194 (diff)
OMAP: DSS2: Remove omap_dss_device argument from dsi_pll_init()
The function dsi_pll_init() has omap_dss_device argument which is not used. Remove this argument. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/dpi.c2
-rw-r--r--drivers/video/omap2/dss/dsi.c5
-rw-r--r--drivers/video/omap2/dss/dss.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index bec8c8a3b49d..3c988b65ca15 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -189,7 +189,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
189 189
190 if (dpi_use_dsi_pll(dssdev)) { 190 if (dpi_use_dsi_pll(dssdev)) {
191 dss_clk_enable(DSS_CLK_SYSCK); 191 dss_clk_enable(DSS_CLK_SYSCK);
192 r = dsi_pll_init(dssdev, 0, 1); 192 r = dsi_pll_init(0, 1);
193 if (r) 193 if (r)
194 goto err3; 194 goto err3;
195 } 195 }
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 6d7148890aa0..b2945fed7bab 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1470,8 +1470,7 @@ err:
1470 return r; 1470 return r;
1471} 1471}
1472 1472
1473int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk, 1473int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv)
1474 bool enable_hsdiv)
1475{ 1474{
1476 int r = 0; 1475 int r = 0;
1477 enum dsi_pll_power_state pwstate; 1476 enum dsi_pll_power_state pwstate;
@@ -3745,7 +3744,7 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev)
3745{ 3744{
3746 int r; 3745 int r;
3747 3746
3748 r = dsi_pll_init(dssdev, true, true); 3747 r = dsi_pll_init(true, true);
3749 if (r) 3748 if (r)
3750 goto err0; 3749 goto err0;
3751 3750
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index eea5c7d58dde..40764e047a5f 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -292,8 +292,7 @@ int dsi_pll_set_clock_div(struct dsi_clock_info *cinfo);
292int dsi_pll_calc_clock_div_pck(bool is_tft, unsigned long req_pck, 292int dsi_pll_calc_clock_div_pck(bool is_tft, unsigned long req_pck,
293 struct dsi_clock_info *cinfo, 293 struct dsi_clock_info *cinfo,
294 struct dispc_clock_info *dispc_cinfo); 294 struct dispc_clock_info *dispc_cinfo);
295int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk, 295int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv);
296 bool enable_hsdiv);
297void dsi_pll_uninit(bool disconnect_lanes); 296void dsi_pll_uninit(bool disconnect_lanes);
298void dsi_get_overlay_fifo_thresholds(enum omap_plane plane, 297void dsi_get_overlay_fifo_thresholds(enum omap_plane plane,
299 u32 fifo_size, enum omap_burst_size *burst_size, 298 u32 fifo_size, enum omap_burst_size *burst_size,