aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-18 07:47:51 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:55:46 -0600
commit3d990df81908a6d3a6d0629e2e97fcdd2900092d (patch)
tree32ac58216997d102c13554169a521afd13eeda44 /drivers
parentcf3cfc1cd9cb6e7d5871da801d7eb70b5a093bec (diff)
Revert "UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX"
This reverts commit d360158cc2b48727a2215ebc1e78c3b1d171335e. Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dpi.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index 207f5c552bb..ff6bd30132d 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -203,10 +203,7 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
if (dpi_use_dsi_pll(dssdev)) {
dss_clk_enable(DSS_CLK_SYSCK);
- if (cpu_is_omap3630())
- r = dsi_pll_init(dssdev, 1, 1);
- else
- r = dsi_pll_init(dssdev, 0, 1);
+ r = dsi_pll_init(dpi.dsidev, 0, 1);
if (r)
goto err3;
}