aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-22 09:03:39 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-11-05 04:17:39 -0500
commit8a3db406f5046dd14dff0e78cea0ba03efec3668 (patch)
tree063dba4d20cdab33aa0f6160b55af23d8cd9bfdf /drivers/video
parenta5b8399fb6866be6ca065d8ab5eb7d8775d0ad26 (diff)
OMAPDSS: DPI: use dpi.dsidev to see whether to use dsi pll
Instead of using dpi_use_dsi_pll() to check if dsi pll is to be used, we can just check if dpi.dsidev != NULL. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dpi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 8b9be0d3f42..ca5f49c44ec 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -137,7 +137,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
137 unsigned long pck; 137 unsigned long pck;
138 int r = 0; 138 int r = 0;
139 139
140 if (dpi_use_dsi_pll(dssdev)) 140 if (dpi.dsidev)
141 r = dpi_set_dsi_clk(dssdev, t->pixel_clock * 1000, &fck, 141 r = dpi_set_dsi_clk(dssdev, t->pixel_clock * 1000, &fck,
142 &lck_div, &pck_div); 142 &lck_div, &pck_div);
143 else 143 else
@@ -216,7 +216,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
216 if (r) 216 if (r)
217 goto err_src_sel; 217 goto err_src_sel;
218 218
219 if (dpi_use_dsi_pll(dssdev)) { 219 if (dpi.dsidev) {
220 r = dsi_runtime_get(dpi.dsidev); 220 r = dsi_runtime_get(dpi.dsidev);
221 if (r) 221 if (r)
222 goto err_get_dsi; 222 goto err_get_dsi;
@@ -244,10 +244,10 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
244 244
245err_mgr_enable: 245err_mgr_enable:
246err_set_mode: 246err_set_mode:
247 if (dpi_use_dsi_pll(dssdev)) 247 if (dpi.dsidev)
248 dsi_pll_uninit(dpi.dsidev, true); 248 dsi_pll_uninit(dpi.dsidev, true);
249err_dsi_pll_init: 249err_dsi_pll_init:
250 if (dpi_use_dsi_pll(dssdev)) 250 if (dpi.dsidev)
251 dsi_runtime_put(dpi.dsidev); 251 dsi_runtime_put(dpi.dsidev);
252err_get_dsi: 252err_get_dsi:
253err_src_sel: 253err_src_sel:
@@ -273,7 +273,7 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
273 273
274 dss_mgr_disable(mgr); 274 dss_mgr_disable(mgr);
275 275
276 if (dpi_use_dsi_pll(dssdev)) { 276 if (dpi.dsidev) {
277 dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK); 277 dss_select_lcd_clk_source(mgr->id, OMAP_DSS_CLK_SRC_FCK);
278 dsi_pll_uninit(dpi.dsidev, true); 278 dsi_pll_uninit(dpi.dsidev, true);
279 dsi_runtime_put(dpi.dsidev); 279 dsi_runtime_put(dpi.dsidev);
@@ -319,7 +319,7 @@ int dpi_check_timings(struct omap_dss_device *dssdev,
319 if (timings->pixel_clock == 0) 319 if (timings->pixel_clock == 0)
320 return -EINVAL; 320 return -EINVAL;
321 321
322 if (dpi_use_dsi_pll(dssdev)) { 322 if (dpi.dsidev) {
323 struct dsi_clock_info dsi_cinfo; 323 struct dsi_clock_info dsi_cinfo;
324 r = dsi_pll_calc_clock_div_pck(dpi.dsidev, 324 r = dsi_pll_calc_clock_div_pck(dpi.dsidev,
325 timings->pixel_clock * 1000, 325 timings->pixel_clock * 1000,