summaryrefslogtreecommitdiffstats
path: root/sound/soc/qcom
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-01-24 18:25:42 +0000
committerMark Brown <broonie@kernel.org>2024-01-24 18:25:42 +0000
commitd24255f0a188d861f5498293dc3bcaa769e34d58 (patch)
treea28778b69e2e72f3bd034e41a59168efa2e80f69 /sound/soc/qcom
parenta9a0303dfe3fe2bc04512c4ce6a589131845d386 (diff)
parent7c70825d1603001e09907b383ed5d1bd283d61a0 (diff)
downloadlinux-stable-d24255f0a188d861f5498293dc3bcaa769e34d58.tar.gz
linux-stable-d24255f0a188d861f5498293dc3bcaa769e34d58.tar.bz2
linux-stable-d24255f0a188d861f5498293dc3bcaa769e34d58.zip
ASoC: Merge up fixes due to dependency with new changes
Future ES8326 changes depend on already applied fixes, merge up the fixes so we can do the new things.
Diffstat (limited to 'sound/soc/qcom')
-rw-r--r--sound/soc/qcom/sc8280xp.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c
index ed4bb551bfbb..b7fd503a1666 100644
--- a/sound/soc/qcom/sc8280xp.c
+++ b/sound/soc/qcom/sc8280xp.c
@@ -32,12 +32,14 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd)
case WSA_CODEC_DMA_RX_0:
case WSA_CODEC_DMA_RX_1:
/*
- * set limit of 0dB on Digital Volume for Speakers,
- * this can prevent damage of speakers to some extent without
- * active speaker protection
+ * Set limit of -3 dB on Digital Volume and 0 dB on PA Volume
+ * to reduce the risk of speaker damage until we have active
+ * speaker protection in place.
*/
- snd_soc_limit_volume(card, "WSA_RX0 Digital Volume", 84);
- snd_soc_limit_volume(card, "WSA_RX1 Digital Volume", 84);
+ snd_soc_limit_volume(card, "WSA_RX0 Digital Volume", 81);
+ snd_soc_limit_volume(card, "WSA_RX1 Digital Volume", 81);
+ snd_soc_limit_volume(card, "SpkrLeft PA Volume", 17);
+ snd_soc_limit_volume(card, "SpkrRight PA Volume", 17);
break;
default:
break;