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 7000822CBEC; Tue, 6 May 2025 21:36: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=1746567407; cv=none; b=XDT+KGt6AQQYEbMUp6tSTp4mzepxlIkok8Gos0kM+wXjuSSvrHIfh2Mke0SRaZ7em5d8TRZk7uEIr/2t3sKziTy0r6LAIWZCZ6yINLJRBdITMOTm9XYHENPltjFJ41ETLo40CRuAhbniVb/rtQM/wp2kj4+mkqaN/UbAYGy0C34= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746567407; c=relaxed/simple; bh=CW7uEOdfUlkf4Dt67iK9CrEW/7FHoAj1LwLd+6ckUGc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eU0yYqZ/CvsQrV+sJuNCpwt+0iD95Bme2ITlvaHvbSbZKWxPgkaa90d5GgZWfxO4DHpYc5lt9ljgqCO9Q2ESmO+pkRpq6l8WpJX9gxAgP8oLoCxjtS2nR/aPIIWq0DlBpli1ArxGIFV6ibYKVOXV6DU+HPBle2WmCyyBCleS1cU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YoFUAwvk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YoFUAwvk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEAE7C4CEE4; Tue, 6 May 2025 21:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746567407; bh=CW7uEOdfUlkf4Dt67iK9CrEW/7FHoAj1LwLd+6ckUGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YoFUAwvkSNQOt+249ks7uFpueJZ3wb7KEc3Pi8zhqgjALhOMAX+iwzSOwmXD/QnJB qooHdg/dujB+urWxNW34tAW8j8U/jLCSNdcIHLb80754M3TEA5XvL097JBo1EhVjCO oBk084c6R9S2fb71AWxcN41Gp8HRCvOcTd5OYyDp8SpwgnCENGg9uJJil3uJihyv0b cWYcZM/oBIjeS8yuviE0loNY4+6wPqP+dD5UDy+ZzHikQJmqrJ0JyQ2Jr0J0lvOP+m ltFsKjIWViDanuK5+73kIyhdh3j9c0NMHQ/1gunetSPolo8QEmMFjgKNmkklTO1hil px/qSNbppZ3LQ== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Stefan Binding , Charles Keepax , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.dev, yung-chuan.liao@linux.intel.com, Vijendar.Mukunda@amd.com, peter.ujfalusi@linux.intel.com, peterz@infradead.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 18/18] ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers Date: Tue, 6 May 2025 17:36:10 -0400 Message-Id: <20250506213610.2983098-18-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250506213610.2983098-1-sashal@kernel.org> References: <20250506213610.2983098-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.27 Content-Transfer-Encoding: 8bit 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 adb1c008e871d..2dc7787234c36 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