diff options
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 316 | u16 syscon; | 316 | u16 syscon; |
| 317 | 317 | ||
| 318 | syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); | 318 | syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); |
| 319 | syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); | 319 | syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03)); |
| 320 | syscon |= (ENAWAKEUP | SIDLEMODE(0x02)); | 320 | syscon |= (ENAWAKEUP | SIDLEMODE(0x02) | CLOCKACTIVITY(0x02)); |
| 321 | OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); | 321 | OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); |
| 322 | 322 | ||
| 323 | OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN); | 323 | OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, XRDYEN | RRDYEN); |
| @@ -333,7 +333,7 @@ static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp) | |||
| 333 | u16 syscon; | 333 | u16 syscon; |
| 334 | 334 | ||
| 335 | syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); | 335 | syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); |
| 336 | syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03)); | 336 | syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03)); |
| 337 | OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); | 337 | OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); |
| 338 | 338 | ||
| 339 | OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, 0); | 339 | OMAP_MCBSP_WRITE(mcbsp->io_base, WAKEUPEN, 0); |