Skip to content

Commit d5463e5

Browse files
Stefan Bindingbroonie
authored andcommitted
ASoC: intel/sdw_utils: Add volume limit to cs35l56 speakers
The 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. Signed-off-by: Stefan Binding <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 02b44a2 commit d5463e5

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

include/sound/soc_sdw_utils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ int asoc_sdw_cs_amp_init(struct snd_soc_card *card,
226226
bool playback);
227227
int asoc_sdw_cs_spk_feedback_rtd_init(struct snd_soc_pcm_runtime *rtd,
228228
struct snd_soc_dai *dai);
229+
int asoc_sdw_cs35l56_volume_limit(struct snd_soc_card *card, const char *name_prefix);
229230

230231
/* MAXIM codec support */
231232
int asoc_sdw_maxim_init(struct snd_soc_card *card,

sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ static int asoc_sdw_bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd)
6060

6161
/* 4 x 16-bit sample slots and FSYNC=48000, BCLK=3.072 MHz */
6262
for_each_rtd_codec_dais(rtd, i, codec_dai) {
63+
ret = asoc_sdw_cs35l56_volume_limit(card, codec_dai->component->name_prefix);
64+
if (ret)
65+
return ret;
66+
6367
ret = snd_soc_dai_set_tdm_slot(codec_dai, tx_mask, rx_mask, 4, 16);
6468
if (ret < 0)
6569
return ret;

sound/soc/sdw_utils/soc_sdw_cs_amp.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,25 @@
1616

1717
#define CODEC_NAME_SIZE 8
1818
#define CS_AMP_CHANNELS_PER_AMP 4
19+
#define CS35L56_SPK_VOLUME_0DB 400 /* 0dB Max */
20+
21+
int asoc_sdw_cs35l56_volume_limit(struct snd_soc_card *card, const char *name_prefix)
22+
{
23+
char *volume_ctl_name;
24+
int ret;
25+
26+
volume_ctl_name = kasprintf(GFP_KERNEL, "%s Speaker Volume", name_prefix);
27+
if (!volume_ctl_name)
28+
return -ENOMEM;
29+
30+
ret = snd_soc_limit_volume(card, volume_ctl_name, CS35L56_SPK_VOLUME_0DB);
31+
if (ret)
32+
dev_err(card->dev, "%s limit set failed: %d\n", volume_ctl_name, ret);
33+
34+
kfree(volume_ctl_name);
35+
return ret;
36+
}
37+
EXPORT_SYMBOL_NS(asoc_sdw_cs35l56_volume_limit, "SND_SOC_SDW_UTILS");
1938

2039
int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
2140
{
@@ -40,6 +59,11 @@ int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai
4059

4160
snprintf(widget_name, sizeof(widget_name), "%s SPK",
4261
codec_dai->component->name_prefix);
62+
63+
ret = asoc_sdw_cs35l56_volume_limit(card, codec_dai->component->name_prefix);
64+
if (ret)
65+
return ret;
66+
4367
ret = snd_soc_dapm_add_routes(&card->dapm, &route, 1);
4468
if (ret)
4569
return ret;

0 commit comments

Comments
 (0)