From b561464be5bb681591b667a056f4488411e317c8 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 13 Oct 2011 19:22:43 +0300
Subject: [PATCH] --- yaml --- r: 284895 b: refs/heads/master c:
 6cc78aa9843155c89faa93231332a8b3817020df h: refs/heads/master i:   284893:
 c5b699984013a9366b5c54194ff8ec7d98b888c0   284891:
 891b1695f1ee4d1d4f3b18fb982a1a3e02b137d2   284887:
 544fe02a91f87531c95fce09daabdca15a62b90f   284879:
 fa3988bffae2024f59e1ed22f635c153b91661a1   284863:
 63e0fb1921621d19bd3d324e2b5dfe1ca0146469 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/omap2/dss/dsi.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 113488c86f1a..5fb09d9ffefd 100644
--- 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
index a01a0119cc7a..9bcb5c2511df 100644
--- 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);