aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-mcpdm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
-rw-r--r--sound/soc/omap/omap-mcpdm.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index fdf655e3f1b3..e134b271a70a 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -40,7 +40,6 @@
40#include <sound/pcm_params.h> 40#include <sound/pcm_params.h>
41#include <sound/soc.h> 41#include <sound/soc.h>
42 42
43#include <plat/cpu.h>
44#include "omap-mcpdm.h" 43#include "omap-mcpdm.h"
45#include "omap-pcm.h" 44#include "omap-pcm.h"
46 45
@@ -258,13 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
258 mutex_lock(&mcpdm->mutex); 257 mutex_lock(&mcpdm->mutex);
259 258
260 if (!dai->active) { 259 if (!dai->active) {
261 /* Enable watch dog for ES above ES 1.0 to avoid saturation */ 260 u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
262 if (omap_rev() != OMAP4430_REV_ES1_0) {
263 u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
264 261
265 omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, 262 omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
266 ctrl | MCPDM_WD_EN);
267 }
268 omap_mcpdm_open_streams(mcpdm); 263 omap_mcpdm_open_streams(mcpdm);
269 } 264 }
270 mutex_unlock(&mcpdm->mutex); 265 mutex_unlock(&mcpdm->mutex);