diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-05-18 16:46:34 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-30 16:19:17 +0100 |
commit | 0efecc086caa1fa12b941ca55cf24e1b4d4e59b8 (patch) | |
tree | 19b685124e86dfe0f1441bc629acfde4d7d8bae4 /sound/soc/omap/omap-mcpdm.c | |
parent | 443500a3927a22c51d9410bac9a1f740897ea219 (diff) | |
download | linux-stable-0efecc086caa1fa12b941ca55cf24e1b4d4e59b8.tar.gz linux-stable-0efecc086caa1fa12b941ca55cf24e1b4d4e59b8.tar.bz2 linux-stable-0efecc086caa1fa12b941ca55cf24e1b4d4e59b8.zip |
ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams()
The DS4_WD_EN bit is only touched before calling omap_mcpdm_open_streams().
Move it inside of that function for simplicity.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
-rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index b837265ac3e9..11bd07cdce22 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -173,6 +173,10 @@ static inline int omap_mcpdm_active(struct omap_mcpdm *mcpdm) */ static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm) { + u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); + + omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN); + omap_mcpdm_write(mcpdm, MCPDM_REG_IRQENABLE_SET, MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL | MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL); @@ -258,12 +262,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream, mutex_lock(&mcpdm->mutex); - if (!dai->active) { - u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL); - - omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN); + if (!dai->active) omap_mcpdm_open_streams(mcpdm); - } + mutex_unlock(&mcpdm->mutex); return 0; |