Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0efecc08 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 443500a3

sound/soc/omap/omap-mcpdm.c

+6 −5
Original line number Diff line number Diff line
@@ -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;