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

Commit 3ccdf5bb authored by Russell King's avatar Russell King Committed by Mark Brown
Browse files

ASoC: kirkwood-i2s: more pause-mode fixes 



Don't even momentarily set the pause status when starting the channel;
if we do, we should check the busy bit to ensure that we comply with
the spec.  In any case, it isn't necessary; we will not active on a
START event so there is no need to pause the DMA.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 982b604b

sound/soc/kirkwood/kirkwood-i2s.c

+0 −9
Original line number Diff line number Diff line
@@ -205,10 +205,6 @@ static int kirkwood_i2s_play_trigger(struct snd_pcm_substream *substream, 


	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		/* stop audio, enable interrupts */

		ctl |= KIRKWOOD_PLAYCTL_PAUSE;

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



		value = readl(priv->io + KIRKWOOD_INT_MASK);

		value |= KIRKWOOD_INT_CAUSE_PLAY_BYTES;

		writel(value, priv->io + KIRKWOOD_INT_MASK);
@@ -269,11 +265,6 @@ static int kirkwood_i2s_rec_trigger(struct snd_pcm_substream *substream, 


	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

		/* stop audio, enable interrupts */

		value = readl(priv->io + KIRKWOOD_RECCTL);

		value |= KIRKWOOD_RECCTL_PAUSE;

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



		value = readl(priv->io + KIRKWOOD_INT_MASK);

		value |= KIRKWOOD_INT_CAUSE_REC_BYTES;

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