diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-10-13 19:22:43 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 08:54:19 +0200 |
| commit | 6cc78aa9843155c89faa93231332a8b3817020df (patch) | |
| tree | 829a5d93cbd2c04e7b717801e4cac62971c13e6d /drivers/video/omap2/dss/dsi.c | |
| parent | 3b98409eb7508ce534243312c3a9ac8543c06808 (diff) | |
| download | op-kernel-dev-6cc78aa9843155c89faa93231332a8b3817020df.zip op-kernel-dev-6cc78aa9843155c89faa93231332a8b3817020df.tar.gz | |
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>
Diffstat (limited to 'drivers/video/omap2/dss/dsi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index a01a011..9bcb5c2 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); |
