From a629578170b5df03c8c8b3a1e077459ec0f4bbf0 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Mon, 25 Sep 2006 12:41:28 +0300 Subject: [PATCH] --- yaml --- r: 36627 b: refs/heads/master c: b5beef5d5dddef820eb36c97216487ed7cf68971 h: refs/heads/master i: 36625: 6aa95ff84dd57ddb363c69fa6209f927bf0ec4ab 36623: edcfa2b824e6510409bcda0390f902847bcb5740 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dma.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fdc0512f7607..a28e6d41ce62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a4e86daa29e73a02ce8eb484837813e341a0b8a +refs/heads/master: b5beef5d5dddef820eb36c97216487ed7cf68971 diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index 9eddc9507147..9948d7a26339 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/arch/arm/plat-omap/dma.c @@ -1339,6 +1339,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",