Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d180913 authored by Charles Keepax's avatar Charles Keepax Committed by Greg Kroah-Hartman
Browse files

ASoC: cs42l52: Correct TLV for Bypass Volume 



[ Upstream commit 91e90c712fade0b69cdff7cc6512f6099bd18ae5 ]

The Bypass Volume is accidentally using a -6dB minimum TLV rather than
the correct -60dB minimum. Add a new TLV to correct this.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220602162119.3393857-5-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 385a031c

sound/soc/codecs/cs42l52.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -137,6 +137,8 @@ static DECLARE_TLV_DB_SCALE(mic_tlv, 1600, 100, 0); 




static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);

static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);





static DECLARE_TLV_DB_SCALE(pass_tlv, -6000, 50, 0);



static DECLARE_TLV_DB_SCALE(mix_tlv, -5150, 50, 0);

static DECLARE_TLV_DB_SCALE(mix_tlv, -5150, 50, 0);





static DECLARE_TLV_DB_SCALE(beep_tlv, -56, 200, 0);

static DECLARE_TLV_DB_SCALE(beep_tlv, -56, 200, 0);
@@ -351,7 +353,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { 
			      CS42L52_SPKB_VOL, 0, 0x40, 0xC0, hl_tlv),

			      CS42L52_SPKB_VOL, 0, 0x40, 0xC0, hl_tlv),





	SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL,

	SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL,

			      CS42L52_PASSTHRUB_VOL, 0, 0x88, 0x90, pga_tlv),

			      CS42L52_PASSTHRUB_VOL, 0, 0x88, 0x90, pass_tlv),





	SOC_DOUBLE("Bypass Mute", CS42L52_MISC_CTL, 4, 5, 1, 0),

	SOC_DOUBLE("Bypass Mute", CS42L52_MISC_CTL, 4, 5, 1, 0),