OMAP: McBSP: Retain McBSP FCLK clockactivity

FCLK may get autogated so that it prevents the McBSP
to work properly. It is the bit 9 that must be set
for maintaining the McBSP FCLK.

Signed-off-by: Eero Nurkkala <ext-eero.nurkkala@nokia.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@nokia.com>
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h
index fe10ae8b027b..70e950e295e1 100644
--- a/arch/arm/plat-omap/include/mach/mcbsp.h
+++ b/arch/arm/plat-omap/include/mach/mcbsp.h
@@ -254,6 +254,7 @@
 #define RDISABLE                0x0001
 
 /********************** McBSP SYSCONFIG bit definitions ********************/
+#define CLOCKACTIVITY(value)    ((value)<<8)
 #define SIDLEMODE(value)        ((value)<<3)
 #define ENAWAKEUP               0x0004
 #define SOFTRST                 0x0002
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 86bfad88abdf..2c274e6f0de9 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -316,8 +316,8 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp)
                 u16 syscon;
 
                 syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON);
-                syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03));
-                syscon |= (ENAWAKEUP | SIDLEMODE(0x02));
+                syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));
+                syscon |= (ENAWAKEUP | SIDLEMODE(0x02) | CLOCKACTIVITY(0x02));
                 OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon);
 
                 OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN);
@@ -333,7 +333,7 @@ static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp)
                 u16 syscon;
 
                 syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON);
-                syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03));
+                syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03));
                 OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon);
 
                 OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, 0);