diff options
author | Oder Chiou <oder_chiou@realtek.com> | 2016-09-06 23:07:49 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-12 15:00:12 -0400 |
commit | a1338a7d4cd401bb71f4562d6896aa2b74eeb1fb (patch) | |
tree | 83757a502d810959ed1bd87b12c9eb9ffc8c3e01 | |
parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) |
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: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/rt5514.c | 6 | ||||
-rw-r--r-- | sound/soc/codecs/rt5514.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index 7162f05101d9..bad41ae40c6d 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c | |||
@@ -278,7 +278,7 @@ static const DECLARE_TLV_DB_RANGE(bst_tlv, | |||
278 | 8, 8, TLV_DB_SCALE_ITEM(1700, 0, 0) | 278 | 8, 8, TLV_DB_SCALE_ITEM(1700, 0, 0) |
279 | ); | 279 | ); |
280 | 280 | ||
281 | static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -17625, 375, 0); | 281 | static const DECLARE_TLV_DB_SCALE(adc_vol_tlv, -1725, 75, 0); |
282 | 282 | ||
283 | static int rt5514_dsp_voice_wake_up_get(struct snd_kcontrol *kcontrol, | 283 | static int rt5514_dsp_voice_wake_up_get(struct snd_kcontrol *kcontrol, |
284 | struct snd_ctl_elem_value *ucontrol) | 284 | struct snd_ctl_elem_value *ucontrol) |
@@ -352,10 +352,10 @@ static const struct snd_kcontrol_new rt5514_snd_controls[] = { | |||
352 | SOC_DOUBLE_TLV("MIC Boost Volume", RT5514_ANA_CTRL_MICBST, | 352 | SOC_DOUBLE_TLV("MIC Boost Volume", RT5514_ANA_CTRL_MICBST, |
353 | RT5514_SEL_BSTL_SFT, RT5514_SEL_BSTR_SFT, 8, 0, bst_tlv), | 353 | RT5514_SEL_BSTL_SFT, RT5514_SEL_BSTR_SFT, 8, 0, bst_tlv), |
354 | SOC_DOUBLE_R_TLV("ADC1 Capture Volume", RT5514_DOWNFILTER0_CTRL1, | 354 | SOC_DOUBLE_R_TLV("ADC1 Capture Volume", RT5514_DOWNFILTER0_CTRL1, |
355 | RT5514_DOWNFILTER0_CTRL2, RT5514_AD_GAIN_SFT, 127, 0, | 355 | RT5514_DOWNFILTER0_CTRL2, RT5514_AD_GAIN_SFT, 63, 0, |
356 | adc_vol_tlv), | 356 | adc_vol_tlv), |
357 | SOC_DOUBLE_R_TLV("ADC2 Capture Volume", RT5514_DOWNFILTER1_CTRL1, | 357 | SOC_DOUBLE_R_TLV("ADC2 Capture Volume", RT5514_DOWNFILTER1_CTRL1, |
358 | RT5514_DOWNFILTER1_CTRL2, RT5514_AD_GAIN_SFT, 127, 0, | 358 | RT5514_DOWNFILTER1_CTRL2, RT5514_AD_GAIN_SFT, 63, 0, |
359 | adc_vol_tlv), | 359 | adc_vol_tlv), |
360 | SOC_SINGLE_EXT("DSP Voice Wake Up", SND_SOC_NOPM, 0, 1, 0, | 360 | SOC_SINGLE_EXT("DSP Voice Wake Up", SND_SOC_NOPM, 0, 1, 0, |
361 | rt5514_dsp_voice_wake_up_get, rt5514_dsp_voice_wake_up_put), | 361 | rt5514_dsp_voice_wake_up_get, rt5514_dsp_voice_wake_up_put), |
diff --git a/sound/soc/codecs/rt5514.h b/sound/soc/codecs/rt5514.h index 68883c68e999..229de0e2c88c 100644 --- a/sound/soc/codecs/rt5514.h +++ b/sound/soc/codecs/rt5514.h | |||
@@ -196,8 +196,8 @@ | |||
196 | #define RT5514_AD_AD_MIX_BIT 10 | 196 | #define RT5514_AD_AD_MIX_BIT 10 |
197 | #define RT5514_AD_AD_MUTE (0x1 << 7) | 197 | #define RT5514_AD_AD_MUTE (0x1 << 7) |
198 | #define RT5514_AD_AD_MUTE_BIT 7 | 198 | #define RT5514_AD_AD_MUTE_BIT 7 |
199 | #define RT5514_AD_GAIN_MASK (0x7f << 0) | 199 | #define RT5514_AD_GAIN_MASK (0x3f << 1) |
200 | #define RT5514_AD_GAIN_SFT 0 | 200 | #define RT5514_AD_GAIN_SFT 1 |
201 | 201 | ||
202 | /* RT5514_ANA_CTRL_MICBST (0x2220) */ | 202 | /* RT5514_ANA_CTRL_MICBST (0x2220) */ |
203 | #define RT5514_SEL_BSTL_MASK (0xf << 4) | 203 | #define RT5514_SEL_BSTL_MASK (0xf << 4) |