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

Unverified Commit df61f9f7 authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Mark Brown
Browse files

ASoC: AMD: Simplify trigger handler 



Now that the I2S channel names are fixed, and DMA data flow order is
consistent (ch1 then ch2), we can simplify channel start order:
start the upstream channel and then the downstream channel for both
playback and capture cases.

Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a337a1e

sound/soc/amd/acp-pcm-dma.c

+3 −6
Original line number Diff line number Diff line
@@ -1024,10 +1024,7 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) 
	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

	case SNDRV_PCM_TRIGGER_RESUME:

		rtd->bytescount = acp_get_byte_count(rtd);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			acp_dma_start(rtd->acp_mmio, rtd->ch1);

			acp_dma_start(rtd->acp_mmio, rtd->ch2);

		} else {

		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

			if (rtd->capture_channel == CAP_CHANNEL0) {

				acp_dma_cap_channel_disable(rtd->acp_mmio,

							    CAP_CHANNEL1);
@@ -1040,9 +1037,9 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) 
				acp_dma_cap_channel_enable(rtd->acp_mmio,

							   CAP_CHANNEL1);

			}

			acp_dma_start(rtd->acp_mmio, rtd->ch2);

			acp_dma_start(rtd->acp_mmio, rtd->ch1);

		}

		acp_dma_start(rtd->acp_mmio, rtd->ch1);

		acp_dma_start(rtd->acp_mmio, rtd->ch2);

		ret = 0;

		break;

	case SNDRV_PCM_TRIGGER_STOP: