| Message ID | 1349338509-3440-3-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/04/2012 11:15 AM, Peter Ujfalusi wrote: > The OMAP revision check is not needed since the watchdog bit is not in use > on 4430 ES1.0 and have no effect when we set the bit. The watchdog need to > be enabled on all other revisions. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > sound/soc/omap/omap-mcpdm.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c > index fdf655e..8f5edc8 100644 > --- a/sound/soc/omap/omap-mcpdm.c > +++ b/sound/soc/omap/omap-mcpdm.c > @@ -40,7 +40,6 @@ > #include <sound/pcm_params.h> > #include <sound/soc.h> > > -#include <plat/cpu.h> > #include "omap-mcpdm.h" > #include "omap-pcm.h" > > @@ -258,14 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, > mutex_lock(&mcpdm->mutex); > > if (!dai->active) { > - /* Enable watch dog for ES above ES 1.0 to avoid saturation */ > - if (omap_rev() != OMAP4430_REV_ES1_0) { > - u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); > + u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); > > - omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, > - ctrl | MCPDM_WD_EN); > - } > - omap_mcpdm_open_streams(mcpdm); > + omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN); Oops. I have removed the omap_mcpdm_open_streams() as well... Will resend :( > } > mutex_unlock(&mcpdm->mutex); > >
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index fdf655e..8f5edc8 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -40,7 +40,6 @@ #include <sound/pcm_params.h> #include <sound/soc.h> -#include <plat/cpu.h> #include "omap-mcpdm.h" #include "omap-pcm.h" @@ -258,14 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, mutex_lock(&mcpdm->mutex); if (!dai->active) { - /* Enable watch dog for ES above ES 1.0 to avoid saturation */ - if (omap_rev() != OMAP4430_REV_ES1_0) { - u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); + u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); - omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, - ctrl | MCPDM_WD_EN); - } - omap_mcpdm_open_streams(mcpdm); + omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN); } mutex_unlock(&mcpdm->mutex);
The OMAP revision check is not needed since the watchdog bit is not in use on 4430 ES1.0 and have no effect when we set the bit. The watchdog need to be enabled on all other revisions. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-mcpdm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)