aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/mcbsp.c
diff options
context:
space:
mode:
authorEero Nurkkala <ext-eero.nurkkala@nokia.com>2009-08-20 09:18:19 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-20 15:10:28 -0400
commitfa3935ba34667ffd35fbb33958cd1d67035fdf82 (patch)
tree9e4c21aa6e7105ad1fdaeb25218b051609f273b3 /arch/arm/plat-omap/mcbsp.c
parentd99a7454e57d3dc9d04d6a77292a056f430a9ece (diff)
OMAP: McBSP: Do not enable wakeups for no-idle mode
When no-idle mode is taken, wakeups need not to be enabled. Moreover, CLOCKACTIVITY bits are unnecessary with this mode also. Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com> Acked-by: Eduardo Valentin <eduardo.valentin@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r--arch/arm/plat-omap/mcbsp.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 85176a5f4148..56a56887dedc 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -319,16 +319,17 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp)
319 syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03)); 319 syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));
320 320
321 spin_lock_irq(&mcbsp->lock); 321 spin_lock_irq(&mcbsp->lock);
322 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) 322 if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
323 syscon |= SIDLEMODE(0x02); 323 syscon |= (ENAWAKEUP | SIDLEMODE(0x02) |
324 else 324 CLOCKACTIVITY(0x02));
325 OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN,
326 XRDYEN | RRDYEN);
327 } else {
325 syscon |= SIDLEMODE(0x01); 328 syscon |= SIDLEMODE(0x01);
329 }
326 spin_unlock_irq(&mcbsp->lock); 330 spin_unlock_irq(&mcbsp->lock);
327 331
328 syscon |= (ENAWAKEUP | CLOCKACTIVITY(0x02));
329 OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); 332 OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon);
330
331 OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN);
332 } 333 }
333} 334}
334 335