From nobody Wed Dec 17 18:59:12 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3CEFC5AD4C for ; Thu, 23 Nov 2023 09:48:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232873AbjKWJsT (ORCPT ); Thu, 23 Nov 2023 04:48:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232589AbjKWJsR (ORCPT ); Thu, 23 Nov 2023 04:48:17 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80B40D44 for ; Thu, 23 Nov 2023 01:48:24 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16E2DC433C8; Thu, 23 Nov 2023 09:48:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700732904; bh=7h/OjemTqWiGjvlLQ2Q4DPbNg34lkEWYu0P40v5ltJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lSQDGinf7W7+Ko2okkgxKhrW84M3Se1kcjwB5H+600QcKJdCesFEaWucBHPwJHMye xQzbl5OO3dWoYPuspyLDCjD0LzCRoMciFwrWFb1urpFctgC6I8ilAzVolMV2X0lVyN B9NbIfoZj7CvNU0P3K6ru2L2n8y6uONQPThWAdUXfet4IRQt/dMqklWa9Bymx+fVLH Bt6suHoEsEd2CBfgMOb1yb0nJpcbzz95RHXX6aJnTH7B5D3ShAStPfUdBTWVE7b8FL Orh8XsP78XVlucZA4mEYhSL67q/HWTsBANNMSsM3eWu58RMpOONSZruSML17R3RIph 44CEoaxU5eyKw== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1r66K9-0005KQ-2E; Thu, 23 Nov 2023 10:48:41 +0100 From: Johan Hovold To: Greg Kroah-Hartman Cc: Sasha Levin , Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , linux-sound@vger.kernel.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH stable-6.6 1/2] ASoC: soc-dai: add flag to mute and unmute stream during trigger Date: Thu, 23 Nov 2023 10:47:48 +0100 Message-ID: <20231123094749.20462-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231123094749.20462-1-johan+linaro@kernel.org> References: <20231123094749.20462-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla 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 Tested-by: Johan Hovold Link: https://lore.kernel.org/r/20231027105747.32450-2-srinivas.kandagatla@= linaro.org Signed-off-by: Mark Brown [ johan: backport to v6.6.2 ] Signed-off-by: Johan Hovold --- include/sound/soc-dai.h | 1 + sound/soc/soc-dai.c | 7 +++++++ sound/soc/soc-pcm.c | 12 ++++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 5fcfba47d98c..adcd8719d343 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -370,6 +370,7 @@ struct snd_soc_dai_ops { =20 /* bit field */ unsigned int no_capture_mute:1; + unsigned int mute_unmute_on_trigger:1; }; =20 struct snd_soc_cdai_ops { diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 3f33f0630ad8..9a828e55c4f9 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -658,6 +658,10 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *= substream, ret =3D 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; @@ -668,6 +672,9 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *s= ubstream, if (rollback && !soc_dai_mark_match(dai, substream, trigger)) continue; =20 + if (dai->driver->ops && dai->driver->ops->mute_unmute_on_trigger) + snd_soc_dai_digital_mute(dai, 1, substream->stream); + r =3D soc_dai_trigger(dai, substream, cmd); if (r < 0) ret =3D r; /* use last ret */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 0a20122b3e55..511446a30c05 100644 --- 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_runtim= e *rtd, snd_soc_dapm_stream_event(rtd, substream->stream, SND_SOC_DAPM_STREAM_START); =20 - 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); + } =20 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) =3D=3D 1) soc_pcm_set_dai_params(dai, NULL); =20 - if (snd_soc_dai_stream_active(dai, substream->stream) =3D=3D 1) - snd_soc_dai_digital_mute(dai, 1, substream->stream); + if (snd_soc_dai_stream_active(dai, substream->stream) =3D=3D 1) { + if (dai->driver->ops && !dai->driver->ops->mute_unmute_on_trigger) + snd_soc_dai_digital_mute(dai, 1, substream->stream); + } } =20 /* run the stream event */ --=20 2.41.0