diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-18 10:47:51 -0400 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-30 13:18:11 -0400 |
| commit | e620b8b83092be5da89443c0e0c5ffe20e77e819 (patch) | |
| tree | 4ec4fc9d9f31736b5cb099b1d827fea8208b262b /drivers/video | |
| parent | 3df11b8d108d53b08845371690d42b921e81b8ed (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/video')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 5 |
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) | |||
| 203 | 203 | ||
| 204 | if (dpi_use_dsi_pll(dssdev)) { | 204 | if (dpi_use_dsi_pll(dssdev)) { |
| 205 | dss_clk_enable(DSS_CLK_SYSCK); | 205 | dss_clk_enable(DSS_CLK_SYSCK); |
| 206 | if (cpu_is_omap3630()) | 206 | r = dsi_pll_init(dpi.dsidev, 0, 1); |
| 207 | r = dsi_pll_init(dssdev, 1, 1); | ||
| 208 | else | ||
| 209 | r = dsi_pll_init(dssdev, 0, 1); | ||
| 210 | if (r) | 207 | if (r) |
| 211 | goto err3; | 208 | goto err3; |
| 212 | } | 209 | } |
