ASoC: intel/sdw_utils: Add volume limits to CS35L56 and CS42L43 speakers
cover ASoC: intel/sdw_utils: Add volume limits to CS35L56 and CS42L43 speakers
Both CS35L56 and CS42L43 have maximum volumes above 0dB. 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 amp or the signal path has been tuned for a particular maximum gain in the amp.
In the cases where systems use the soc_sdw_* drivers, audio above the 0dB volume will likely always be distorted, therefore apply a 0dB limit to those devices.
Stefan Binding (2):
ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
ASoC: intel/sdw_utils: Add volume limit to cs35l56 speakers
include/sound/soc_sdw_utils.h | 1 + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 4 ++++ sound/soc/sdw_utils/soc_sdw_cs42l43.c | 10 ++++++++ sound/soc/sdw_utils/soc_sdw_cs_amp.c | 24 ++++++++++++++++++++ 4 files changed, 39 insertions(+)
Signature · 1 line
2.43.0
PATCH 1/2 ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
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.
--- sound/soc/sdw_utils/soc_sdw_cs42l43.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/soc/sdw_utils/soc_sdw_cs42l43.c +10 -0
@@ -20,6 +20,8 @@#include <sound/soc-dapm.h> #include <sound/soc_sdw_utils.h> +#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_soreturn -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)
Signature · 1 line
2.43.0
Re: [PATCH v1 1/2] ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
Quoted 7 lines · Stefan Binding
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.
Quoted 6 lines
In the case of systems which use the
soc_sdw_cs42l43driver, 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 <[email protected]>---
Thanks,
Charles
PATCH 2/2 ASoC: intel/sdw_utils: Add volume limit to cs35l56 speakers
In reply to Stefan BindingThe volume control for cs35l56 speakers has a maximum gain of +12 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 amp or the signal path has been tuned for a particular maximum gain in the amp.
In the case of systems which use the soc_sdw_* driver, audio will likely be distorted in all cases above 0 dB, therefore add a volume limit of 400, which is 0 dB maximum volume inside this driver.
The volume limit should be applied to both soundwire and soundwire bridge configurations.
--- include/sound/soc_sdw_utils.h | 1 + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 4 ++++ sound/soc/sdw_utils/soc_sdw_cs_amp.c | 24 ++++++++++++++++++++ 3 files changed, 29 insertions(+)
include/sound/soc_sdw_utils.h +1 -0
@@ -226,6 +226,7 @@ int asoc_sdw_cs_amp_init(struct snd_soc_card *card, bool playback);int asoc_sdw_cs_spk_feedback_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai); +int asoc_sdw_cs35l56_volume_limit (struct snd_soc_card *card,const char *name_prefix);/* MAXIM codec support */ int asoc_sdw_maxim_init(struct snd_soc_card *card,
sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c +4 -0
@@ -60,6 +60,10 @@ static int asoc_sdw_bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd)/* 4 x 16-bit sample slots and FSYNC=48000, BCLK=3.072 MHz */ for_each_rtd_codec_dais (rtd, i, codec_dai) { + ret =asoc_sdw_cs35l56_volume_limit (card, codec_dai->component->name_prefix); +if (ret) +return ret; + ret =snd_soc_dai_set_tdm_slot (codec_dai, tx_mask, rx_mask,4 ,16 );if (ret <0 )return ret;
sound/soc/sdw_utils/soc_sdw_cs_amp.c +24 -0
@@ -16,6 +16,25 @@#define CODEC_NAME_SIZE 8#define CS_AMP_CHANNELS_PER_AMP 4 +#define CS35L56_SPK_VOLUME_0DB 400/* 0dB Max */ + +int asoc_sdw_cs35l56_volume_limit (struct snd_soc_card *card,const char *name_prefix) +{ +char *volume_ctl_name; +int ret; + + volume_ctl_name =kasprintf (GFP_KERNEL ,"%s Speaker Volume" , name_prefix); +if (!volume_ctl_name) +return -ENOMEM ; + + ret =snd_soc_limit_volume (card, volume_ctl_name,CS35L56_SPK_VOLUME_0DB ); +if (ret) +dev_err (card->dev,"%s limit set failed: %d\n" , volume_ctl_name, ret); + +kfree (volume_ctl_name); +return ret; +} +EXPORT_SYMBOL_NS (asoc_sdw_cs35l56_volume_limit,"SND_SOC_SDW_UTILS" );int asoc_sdw_cs_spk_rtd_init (struct snd_soc_pcm_runtime *rtd,struct snd_soc_dai *dai) {
@@ -40,6 +59,11 @@ int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_daisnprintf (widget_name,sizeof (widget_name),"%s SPK" , codec_dai->component->name_prefix); + + ret =asoc_sdw_cs35l56_volume_limit (card, codec_dai->component->name_prefix); +if (ret) +return ret; + ret =snd_soc_dapm_add_routes (&card->dapm, &route,1 );if (ret)return ret;
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 8 lines · Stefan Binding
Both CS35L56 and CS42L43 have maximum volumes above 0dB. 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 amp or the signal path has been tuned for a particular maximum gain in the amp.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
commit: 02b44a2b2bdcee03cbb92484d31e9ca1b91b2a38
[2/2] ASoC: intel/sdw_utils: Add volume limit to cs35l56 speakers
commit: d5463e531c128ff1b141fdba2e13345cd50028a4All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark