OMAP: McBSP: Always maintain McBSP fclk while active

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / mcbsp.c

diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index a94d03edea0255e8509a1c2cc8f52a8364168b4b..02b3f2de00e5ac08cbcf0409986dfc86ece3f4dc 100644 (file)
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -248,8 +248,8 @@ int omap_mcbsp_request(unsigned int id)
                u16 w;
 
                w = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON);
-               w &= ~(ENAWAKEUP | SIDLEMODE(0x03));
-               w |= (ENAWAKEUP | SIDLEMODE(0x02));
+               w &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));
+               w |= (ENAWAKEUP | SIDLEMODE(0x02) | CLOCKACTIVITY(0x02));
                OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, w);
 
                OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, WAKEUPEN_ALL);
@@ -308,7 +308,7 @@ void omap_mcbsp_free(unsigned int id)
                u16 w;
 
                w = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON);
-               w &= ~(ENAWAKEUP | SIDLEMODE(0x03));
+               w &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));
                OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, w);
 
                w = OMAP_MCBSP_READ(mcbsp->io_base, WAKEUPEN);