From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D6FA2566; Tue, 27 May 2025 17:51:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368307; cv=none; b=iH6B/RyDQzBIZYqg6TShDMBhcoiQouz9ZuasBjl/muqrvHnRQkbtNI9v1TmjtY3Usyu+yNlUs7EucSVyRfPB0ikiXg6NyiefbmxyoSgWfoEXJxi/J8wLJJgomtqri4GpnpOVkPLEbvR4LW8i3DHyAr1NNBtt0hfIW+5H1mK36Hw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748368307; c=relaxed/simple; bh=8MU4bZl+yxrQ9x013rsktd6rFOneGQtq70zH0Ga6oIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IT7tDIFihfXnDF01Gp6Af2ITEji5Ty3ayjkI+BrP2mz4E52jFi5SPl+Umj200rUSNPyWKGc+g7bzd5zNTVkODONE6z25vOB7fd3nkvKT0GzElwcXdb8cURAUEuwE4Q5y4p3GIbjZAf4nRw5boMOh4/LMRGBChV2vx8CRSqcDNDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XG1ImDpi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XG1ImDpi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2EC8C4CEEA; Tue, 27 May 2025 17:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748368307; bh=8MU4bZl+yxrQ9x013rsktd6rFOneGQtq70zH0Ga6oIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XG1ImDpi8nLoeOdtmP6GraAMiepuZVa+6EHKKipRu+S2cnkPLJWbTTguWMzk0LzGc lZ73n9iQGw8nlk4FC/0wKPQ82fahG0d1l3CZCafv3a2oq4qpttbcOH73yIOO+2kDEZ In+QyeJVdQiJ1NeY04gO9Qi8jGxXsHLwaYOfnm2k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stefan Binding , Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 6.14 665/783] ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers Date: Tue, 27 May 2025 18:27:42 +0200 Message-ID: <20250527162540.205827399@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Binding [ Upstream commit 02b44a2b2bdcee03cbb92484d31e9ca1b91b2a38 ] The volume control for cs42l43 speakers has a maximum gain of +31.5 dB. However, for many use cases, this can cause distorted audio, depending various factors, such as other signal-processing elements in the chain, for example if the audio passes through a gain control before reaching the codec or the signal path has been tuned for a particular maximum gain in the codec. In the case of systems which use the soc_sdw_cs42l43 driver, audio will likely be distorted in all cases above 0 dB, therefore add a volume limit of 128, which is 0 dB maximum volume inside this driver. Signed-off-by: Stefan Binding Reviewed-by: Charles Keepax Link: https://patch.msgid.link/20250430103134.24579-2-sbinding@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sdw_utils/soc_sdw_cs42l43.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/sdw_utils/soc_sdw_cs42l43.c b/sound/soc/sdw_utils/soc_sdw_cs42l43.c index 668c9d28a1c12..b415d45d520d0 100644 --- a/sound/soc/sdw_utils/soc_sdw_cs42l43.c +++ b/sound/soc/sdw_utils/soc_sdw_cs42l43.c @@ -20,6 +20,8 @@ #include #include +#define CS42L43_SPK_VOLUME_0DB 128 /* 0dB Max */ + static const struct snd_soc_dapm_route cs42l43_hs_map[] = { { "Headphone", NULL, "cs42l43 AMP3_OUT" }, { "Headphone", NULL, "cs42l43 AMP4_OUT" }, @@ -117,6 +119,14 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_so return -ENOMEM; } + ret = snd_soc_limit_volume(card, "cs42l43 Speaker Digital Volume", + CS42L43_SPK_VOLUME_0DB); + if (ret) + dev_err(card->dev, "cs42l43 speaker volume limit failed: %d\n", ret); + else + dev_info(card->dev, "Setting CS42L43 Speaker volume limit to %d\n", + CS42L43_SPK_VOLUME_0DB); + ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_spk_map, ARRAY_SIZE(cs42l43_spk_map)); if (ret) -- 2.39.5