Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa3935ba authored by Eero Nurkkala's avatar Eero Nurkkala Committed by Mark Brown
Browse files

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: default avatarEero Nurkkala <ext-eero.nurkkala@nokia.com>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@nokia.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d99a7454

arch/arm/plat-omap/mcbsp.c

+7 −6
Original line number Diff line number Diff line
@@ -319,16 +319,17 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) 
		syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));



		spin_lock_irq(&mcbsp->lock);

		if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD)

			syscon |= SIDLEMODE(0x02);

		else

		if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {

			syscon |= (ENAWAKEUP | SIDLEMODE(0x02) |

					CLOCKACTIVITY(0x02));

			OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN,

					XRDYEN | RRDYEN);

		} else {

			syscon |= SIDLEMODE(0x01);

		}

		spin_unlock_irq(&mcbsp->lock);



		syscon |= (ENAWAKEUP | CLOCKACTIVITY(0x02));

		OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon);



		OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN);

	}

}