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

Commit 7272e051 authored by Brian Austin's avatar Brian Austin Committed by Mark Brown
Browse files

ASoC: cs42l51: Fix SOC_DOUBLE_R_SX_TLV shift values for ADC, PCM, and Analog kcontrols 



The shift values for the ADC,PCM, and Analog kcontrols were wrong causing wrong values for the SOC_DOUBLE_R_SX_TLV macros
Fixed the TLV for aout_tlv to show -102dB correctly

Fixes: 1d99f243 (ASoC: core: Rework SOC_DOUBLE_R_SX_TLV add SOC_SINGLE_SX_TLV)
Reported-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
parent 38dbfb59

sound/soc/codecs/cs42l51.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -124,9 +124,8 @@ static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol, 




static const DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -5150, 50, 0);

static const DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -5150, 50, 0);

static const DECLARE_TLV_DB_SCALE(tone_tlv, -1050, 150, 0);

static const DECLARE_TLV_DB_SCALE(tone_tlv, -1050, 150, 0);

/* This is a lie. after -102 db, it stays at -102 */



/* maybe a range would be better */

static const DECLARE_TLV_DB_SCALE(aout_tlv, -10200, 50, 0);

static const DECLARE_TLV_DB_SCALE(aout_tlv, -11550, 50, 0);





static const DECLARE_TLV_DB_SCALE(boost_tlv, 1600, 1600, 0);

static const DECLARE_TLV_DB_SCALE(boost_tlv, 1600, 1600, 0);

static const char *chan_mix[] = {

static const char *chan_mix[] = {
@@ -141,7 +140,7 @@ static const struct soc_enum cs42l51_chan_mix = 
static const struct snd_kcontrol_new cs42l51_snd_controls[] = {

static const struct snd_kcontrol_new cs42l51_snd_controls[] = {

	SOC_DOUBLE_R_SX_TLV("PCM Playback Volume",

	SOC_DOUBLE_R_SX_TLV("PCM Playback Volume",

			CS42L51_PCMA_VOL, CS42L51_PCMB_VOL,

			CS42L51_PCMA_VOL, CS42L51_PCMB_VOL,

			6, 0x19, 0x7F, adc_pcm_tlv),

			0, 0x19, 0x7F, adc_pcm_tlv),

	SOC_DOUBLE_R("PCM Playback Switch",

	SOC_DOUBLE_R("PCM Playback Switch",

			CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 7, 1, 1),

			CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 7, 1, 1),

	SOC_DOUBLE_R_SX_TLV("Analog Playback Volume",

	SOC_DOUBLE_R_SX_TLV("Analog Playback Volume",
@@ -149,7 +148,7 @@ static const struct snd_kcontrol_new cs42l51_snd_controls[] = { 
			0, 0x34, 0xE4, aout_tlv),

			0, 0x34, 0xE4, aout_tlv),

	SOC_DOUBLE_R_SX_TLV("ADC Mixer Volume",

	SOC_DOUBLE_R_SX_TLV("ADC Mixer Volume",

			CS42L51_ADCA_VOL, CS42L51_ADCB_VOL,

			CS42L51_ADCA_VOL, CS42L51_ADCB_VOL,

			6, 0x19, 0x7F, adc_pcm_tlv),

			0, 0x19, 0x7F, adc_pcm_tlv),

	SOC_DOUBLE_R("ADC Mixer Switch",

	SOC_DOUBLE_R("ADC Mixer Switch",

			CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, 7, 1, 1),

			CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, 7, 1, 1),

	SOC_SINGLE("Playback Deemphasis Switch", CS42L51_DAC_CTL, 3, 1, 0),

	SOC_SINGLE("Playback Deemphasis Switch", CS42L51_DAC_CTL, 3, 1, 0),