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

Commit a1338a7d authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

ASoC: rt5514: make the volume TLV to match the units 0.01dB 



The volume have a step of 0.375dB, but TLV uses the units 0.01dB. It should
be changed to a step of 0.75dB to match the units of TLV.

Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

sound/soc/codecs/rt5514.c

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static const DECLARE_TLV_DB_RANGE(bst_tlv, 
	8, 8, TLV_DB_SCALE_ITEM(1700, 0, 0)

);



static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0);

static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0);



static int rt5514_dsp_voice_wake_up_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)
@@ -352,10 +352,10 @@ static const struct snd_kcontrol_new rt5514_snd_controls[] = { 
	SOC_DOUBLE_TLV("MIC Boost Volume", RT5514_ANA_CTRL_MICBST,

		RT5514_SEL_BSTL_SFT, RT5514_SEL_BSTR_SFT, 8, 0, bst_tlv),

	SOC_DOUBLE_R_TLV("ADC1 Capture Volume", RT5514_DOWNFILTER0_CTRL1,

		RT5514_DOWNFILTER0_CTRL2, RT5514_AD_GAIN_SFT, 127, 0,

		RT5514_DOWNFILTER0_CTRL2, RT5514_AD_GAIN_SFT, 63, 0,

		adc_vol_tlv),

	SOC_DOUBLE_R_TLV("ADC2 Capture Volume", RT5514_DOWNFILTER1_CTRL1,

		RT5514_DOWNFILTER1_CTRL2, RT5514_AD_GAIN_SFT, 127, 0,

		RT5514_DOWNFILTER1_CTRL2, RT5514_AD_GAIN_SFT, 63, 0,

		adc_vol_tlv),

	SOC_SINGLE_EXT("DSP Voice Wake Up", SND_SOC_NOPM, 0, 1, 0,

		rt5514_dsp_voice_wake_up_get, rt5514_dsp_voice_wake_up_put),

sound/soc/codecs/rt5514.h

+2 −2
Original line number Diff line number Diff line
@@ -196,8 +196,8 @@ 
#define RT5514_AD_AD_MIX_BIT			10

#define RT5514_AD_AD_MUTE			(0x1 << 7)

#define RT5514_AD_AD_MUTE_BIT			7

#define RT5514_AD_GAIN_MASK			(0x7f << 0)

#define RT5514_AD_GAIN_SFT			0

#define RT5514_AD_GAIN_MASK			(0x3f << 1)

#define RT5514_AD_GAIN_SFT			1



/*  RT5514_ANA_CTRL_MICBST (0x2220) */

#define RT5514_SEL_BSTL_MASK			(0xf << 4)