ASoC: soc-dai: add flag to mute and unmute stream during trigger

commit f0220575e65abe09c09cd17826a3cdea76e8d58f upstream.

In some setups like Speaker amps which are very sensitive, ex: keeping them
unmute without actual data stream for very short duration results in a
static charge and results in pop and clicks. To minimize this, provide a way
to mute and unmute such codecs during trigger callbacks.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231027105747.32450-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
[ johan: backport to v6.6.2 ]
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e3906ecda740a6ab373518214d2412a9b82f1855..5827b4d882fcc34a23ba8acae8c4406c2b673f96 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -355,6 +355,7 @@ struct snd_soc_dai_ops {
 
        /* bit field */
        unsigned int no_capture_mute:1;
+       unsigned int mute_unmute_on_trigger:1;
 };
 
 struct snd_soc_cdai_ops {

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 02dd64dea17925b45c69654f99ef7399674604b8..28d8c6c3d3b26cf901eae8fcf8b3bc744b5cee3f 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -641,6 +641,10 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,
                        ret = soc_dai_trigger(dai, substream, cmd);
                        if (ret < 0)
                                break;
+
+                       if (dai->driver->ops && dai->driver->ops->mute_unmute_on_trigger)
+                               snd_soc_dai_digital_mute(dai, 0, substream->stream);
+
                        soc_dai_mark_push(dai, substream, trigger);
                }
                break;
@@ -651,6 +655,9 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,
                        if (rollback && !soc_dai_mark_match(dai, substream, trigger))
                                continue;
 
+                       if (dai->driver->ops && dai->driver->ops->mute_unmute_on_trigger)
+                               snd_soc_dai_digital_mute(dai, 1, substream->stream);
+
                        r = soc_dai_trigger(dai, substream, cmd);
                        if (r < 0)
                                ret = r; /* use last ret */

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 6cf4cd667d036c6a7a1d15b720c8003dbb6dcde0..4cb710a4cea42dec838d6e1713fe3a61a00eaee5 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -896,8 +896,10 @@ static int __soc_pcm_prepare(struct snd_soc_pcm_runtime *rtd,
        snd_soc_dapm_stream_event(rtd, substream->stream,
                        SND_SOC_DAPM_STREAM_START);
 
-       for_each_rtd_dais(rtd, i, dai)
-               snd_soc_dai_digital_mute(dai, 0, substream->stream);
+       for_each_rtd_dais(rtd, i, dai) {
+               if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger)
+                       snd_soc_dai_digital_mute(dai, 0, substream->stream);
+       }
 
 out:
        return soc_pcm_ret(rtd, ret);
@@ -939,8 +941,10 @@ static int soc_pcm_hw_clean(struct snd_soc_pcm_runtime *rtd,
                if (snd_soc_dai_active(dai) == 1)
                        soc_pcm_set_dai_params(dai, NULL);
 
-               if (snd_soc_dai_stream_active(dai, substream->stream) == 1)
-                       snd_soc_dai_digital_mute(dai, 1, substream->stream);
+               if (snd_soc_dai_stream_active(dai, substream->stream) == 1) {
+                       if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger)
+                               snd_soc_dai_digital_mute(dai, 1, substream->stream);
+               }
        }
 
        /* run the stream event */