Skip to content

ASoC: dwc: Revert i2s_stop to the upstream version #7588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pelwell wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
Open

ASoC: dwc: Revert i2s_stop to the upstream version #7588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions sound/soc/dwc/dwc-i2s.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,23 @@ static void i2s_start(struct dw_i2s_dev *dev,
static void i2s_stop(struct dw_i2s_dev *dev,
struct snd_pcm_substream *substream)
{
if (dev->is_jh7110) {
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct snd_soc_dai_link *dai_link = rtd->dai_link;

dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC;
}
i2s_clear_irqs(dev, substream->stream);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
i2s_write_reg(dev->i2s_base, ITER, 0);
else
i2s_write_reg(dev->i2s_base, IRER, 0);

if (!(dev->use_pio || dev->is_jh7110))
i2s_disable_dma(dev, substream->stream);

i2s_disable_irqs(dev, substream->stream, 8);


if (!dev->active) {
i2s_write_reg(dev->i2s_base, CER, 0);
i2s_write_reg(dev->i2s_base, IER, 0);
}
}

static void i2s_pause(struct dw_i2s_dev *dev,
Expand Down
Loading