From: Imre Deak <imre.deak@solidboot.com>
Date: Fri, 4 Aug 2006 12:53:55 +0000 (+0300)
Subject: ARM: OMAP: Sleep is prevented when no LCD is attached
X-Git-Tag: v2.6.18-omap1~118^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=94de3a85fa5c5217d933a8f9bf699479e569ba9a;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Sleep is prevented when no LCD is attached

We have to make sure that the LCD DMA external destination bit is
cleared by default, otherwise OMAP won't sleep.

Signed-off-by: Imre Deak <imre.deak@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
---

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index ab0eff0466b..88eb556166f 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1378,6 +1378,14 @@ static int __init omap_init_dma(void)
 			dma_chan_count = 16;
 		} else
 			dma_chan_count = 9;
+		if (cpu_is_omap16xx()) {
+			u16 w;
+
+			/* this would prevent OMAP sleep */
+			w = omap_readw(OMAP1610_DMA_LCD_CTRL);
+			w &= ~(1 << 8);
+			omap_writew(w, OMAP1610_DMA_LCD_CTRL);
+		}
 	} else if (cpu_is_omap24xx()) {
 		u8 revision = omap_readb(OMAP_DMA4_REVISION);
 		printk(KERN_INFO "OMAP DMA hardware revision %d.%d\n",