From 5793cf6bf0cd26f55acdaaebf570d4a26a09433b Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Mon, 26 Apr 2021 23:56:04 +0100 Subject: [PATCH] Revert "Operational change to correct for 5.5+ change in trigger order; REVISIT!" This reverts commit e553d4f851fe35ef2706e5b9d0ea85e26a5d4ce3. --- Makefile | 2 +- ac108.c | 2 +- patches/back-to-v5.4.diff | 2 +- seeed-voicecard.c | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1aa0949..b9de7f4 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ ifneq ($(KERNELRELEASE),) snd-soc-wm8960-objs := wm8960.o snd-soc-ac108-objs := ac108.o ac101.o -snd-soc-seeed-voicecard-objs := seeed-voicecard.o ac101.o +snd-soc-seeed-voicecard-objs := seeed-voicecard.o obj-m += snd-soc-wm8960.o diff --git a/ac108.c b/ac108.c index 075b6cd..4075eee 100644 --- a/ac108.c +++ b/ac108.c @@ -1058,7 +1058,7 @@ static int ac108_trigger(struct snd_pcm_substream *substream, int cmd, snd_pcm_stream_str(substream), cmd); - if (!cmd && ac10x->i2c101 && _MASTER_MULTI_CODEC == _MASTER_AC101) { + if (ac10x->i2c101 && _MASTER_MULTI_CODEC == _MASTER_AC101) { ac101_trigger(substream, cmd, dai); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { goto __ret; diff --git a/patches/back-to-v5.4.diff b/patches/back-to-v5.4.diff index cd82568..b7d57a8 100644 --- a/patches/back-to-v5.4.diff +++ b/patches/back-to-v5.4.diff @@ -134,9 +134,9 @@ index c6d9048..43535aa 100644 struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = rtd->codec_dai; - struct ac10x_priv *ac10x = snd_soc_dai_get_drvdata(dai); struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card); #if CONFIG_AC10X_TRIG_LOCK + unsigned long flags; @@ -205,7 +205,7 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd dev_dbg(rtd->card->dev, "%s() stream=%s cmd=%d play:%d, capt:%d\n", diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 25bca71..9f5f7e7 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -198,7 +198,6 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); - struct ac10x_priv *ac10x = snd_soc_dai_get_drvdata(dai); struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card); #if CONFIG_AC10X_TRIG_LOCK unsigned long flags; @@ -218,9 +217,6 @@ static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd /* I know it will degrades performance, but I have no choice */ spin_lock_irqsave(&priv->lock, flags); #endif - if (cmd && ac10x->i2c101 && _MASTER_MULTI_CODEC == _MASTER_AC101) { - ac101_trigger(substream, cmd, dai); - } if (_set_clock[SNDRV_PCM_STREAM_CAPTURE]) _set_clock[SNDRV_PCM_STREAM_CAPTURE](1); if (_set_clock[SNDRV_PCM_STREAM_PLAYBACK]) _set_clock[SNDRV_PCM_STREAM_PLAYBACK](1); #if CONFIG_AC10X_TRIG_LOCK