aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLee Jones <lee.jones@canonical.com>2010-07-21 11:32:26 +0200
committerLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-30 10:14:55 -0700
commit499c0abd0ac5fd4d233d017e284a216360f914cb (patch)
treedb318ea3868941ead6ee2e7f06593b93f9d50d72 /drivers
parent39186057ba32d404842770f6eddbf46942cc35db (diff)
UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX
BugLink: http://bugs.launchpad.net/bugs/608095 This helps provide the required setup to enable USB Ethernet (usb0) and USB host on the XM Beagleboard (A rev). This will be submitted upstream by Steve Sakoman. Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Lee Jones <lee.jones@canonical.com> 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, 4 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index ff6bd30132d..207f5c552bb 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -203,7 +203,10 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
if (dpi_use_dsi_pll(dssdev)) {
dss_clk_enable(DSS_CLK_SYSCK);
- r = dsi_pll_init(dpi.dsidev, 0, 1);
+ if (cpu_is_omap3630())
+ r = dsi_pll_init(dssdev, 1, 1);
+ else
+ r = dsi_pll_init(dssdev, 0, 1);
if (r)
goto err3;
}