Commit f0220575 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown

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

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: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20231027105747.32450-2-srinivas.kandagatla@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 168d9784
...@@ -370,6 +370,7 @@ struct snd_soc_dai_ops { ...@@ -370,6 +370,7 @@ struct snd_soc_dai_ops {
/* bit field */ /* bit field */
unsigned int no_capture_mute:1; unsigned int no_capture_mute:1;
unsigned int mute_unmute_on_trigger:1;
}; };
struct snd_soc_cdai_ops { struct snd_soc_cdai_ops {
......
...@@ -658,6 +658,10 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, ...@@ -658,6 +658,10 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,
ret = soc_dai_trigger(dai, substream, cmd); ret = soc_dai_trigger(dai, substream, cmd);
if (ret < 0) if (ret < 0)
break; 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); soc_dai_mark_push(dai, substream, trigger);
} }
break; break;
...@@ -668,6 +672,9 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, ...@@ -668,6 +672,9 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,
if (rollback && !soc_dai_mark_match(dai, substream, trigger)) if (rollback && !soc_dai_mark_match(dai, substream, trigger))
continue; 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); r = soc_dai_trigger(dai, substream, cmd);
if (r < 0) if (r < 0)
ret = r; /* use last ret */ ret = r; /* use last ret */
......
...@@ -703,10 +703,12 @@ static int soc_pcm_clean(struct snd_soc_pcm_runtime *rtd, ...@@ -703,10 +703,12 @@ static int soc_pcm_clean(struct snd_soc_pcm_runtime *rtd,
if (snd_soc_dai_active(dai) == 0) if (snd_soc_dai_active(dai) == 0)
soc_pcm_set_dai_params(dai, NULL); soc_pcm_set_dai_params(dai, NULL);
if (snd_soc_dai_stream_active(dai, substream->stream) == 0) if (snd_soc_dai_stream_active(dai, substream->stream) == 0) {
if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger)
snd_soc_dai_digital_mute(dai, 1, substream->stream); snd_soc_dai_digital_mute(dai, 1, substream->stream);
} }
} }
}
for_each_rtd_dais(rtd, i, dai) for_each_rtd_dais(rtd, i, dai)
snd_soc_dai_shutdown(dai, substream, rollback); snd_soc_dai_shutdown(dai, substream, rollback);
...@@ -898,8 +900,10 @@ static int __soc_pcm_prepare(struct snd_soc_pcm_runtime *rtd, ...@@ -898,8 +900,10 @@ static int __soc_pcm_prepare(struct snd_soc_pcm_runtime *rtd,
snd_soc_dapm_stream_event(rtd, substream->stream, snd_soc_dapm_stream_event(rtd, substream->stream,
SND_SOC_DAPM_STREAM_START); SND_SOC_DAPM_STREAM_START);
for_each_rtd_dais(rtd, i, dai) 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); snd_soc_dai_digital_mute(dai, 0, substream->stream);
}
out: out:
return soc_pcm_ret(rtd, ret); return soc_pcm_ret(rtd, ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment