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

Commit 4f6f1478 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mark Brown
Browse files

ASoC: kirkwood: Fix erroneous double output while playing 



This patch fixes the setting of the register KIRKWOOD_PLAYCTL which did
always streaming on both I2S and SPDIF, ignoring the DAI ID.

The bug was introduced by the commit 75b9b65e
 "ASoC: kirkwood: add S/PDIF support"

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 1c195ddb

sound/soc/kirkwood/kirkwood-i2s.c

+5 −5
Original line number Diff line number Diff line
@@ -248,15 +248,15 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream, 
				   ctl);

	}



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		/* configure */

		ctl = priv->ctl_play;

		if (dai->id == 0)

			ctl &= ~KIRKWOOD_PLAYCTL_SPDIF_EN;	/* i2s */

		else

			ctl &= ~KIRKWOOD_PLAYCTL_I2S_EN;	/* spdif */



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		/* configure */

		ctl = priv->ctl_play;

		value = ctl & ~KIRKWOOD_PLAYCTL_ENABLE_MASK;

		writel(value, priv->io + KIRKWOOD_PLAYCTL);