---

yaml --- r: 284895 b: refs/heads/master c: 6cc78aa h: refs/heads/master i: 284893: c5b6999 284891: 891b169 284887: 544fe02 284879: fa3988b 284863: 63e0fb1 v: v3
git-mirror · Dec 2, 2011 · b561464 · b561464
1 parent 973dbb1
commit b561464
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b98409eb7508ce534243312c3a9ac8543c06808
+refs/heads/master: 6cc78aa9843155c89faa93231332a8b3817020df
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
@@ -3544,9 +3544,11 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
 	if (dsi->ulps_enabled)
 		return 0;
 
+	/* DDR_CLK_ALWAYS_ON */
 	if (REG_GET(dsidev, DSI_CLK_CTRL, 13, 13)) {
-		DSSERR("DDR_CLK_ALWAYS_ON enabled when entering ULPS\n");
-		return -EIO;
+		dsi_if_enable(dsidev, 0);
+		REG_FLD_MOD(dsidev, DSI_CLK_CTRL, 0, 13, 13);
+		dsi_if_enable(dsidev, 1);
 	}
 
 	dsi_sync_vc(dsidev, 0);