From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 13 Oct 2011 16:22:43 +0000 (+0300)
Subject: OMAPDSS: DSI: disable DDR_CLK_ALWAYS_ON when entering ULPS
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cc78aa9843155c89faa93231332a8b3817020df;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

OMAPDSS: DSI: disable DDR_CLK_ALWAYS_ON when entering ULPS

ULPS cannot be entered if the DDR clk is enabled. Thus disable the DDR
clk before entering ULPS.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index a01a0119cc7a..9bcb5c2511df 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/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);