iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rt5645: Correct the naming and setting of ADC Boost Volume Control

Browse Source 
Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2015-10-01 14:47:09 +08:00 committed by Mark Brown
parent 6ff33f3902
commit 8c1a9d6323
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/rt5645.c
View File

@ -519,11 +519,11 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = {
RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 63, 0, adc_vol_tlv), RT5645_L_VOL_SFT + 1, RT5645_R_VOL_SFT + 1, 63, 0, adc_vol_tlv),
/* ADC Boost Volume Control */ /* ADC Boost Volume Control */
SOC_DOUBLE_TLV("STO1 ADC Boost Gain", RT5645_ADC_BST_VOL1, SOC_DOUBLE_TLV("ADC Boost Capture Volume", RT5645_ADC_BST_VOL1,
RT5645_STO1_ADC_L_BST_SFT, RT5645_STO1_ADC_R_BST_SFT, 3, 0, RT5645_STO1_ADC_L_BST_SFT, RT5645_STO1_ADC_R_BST_SFT, 3, 0,
adc_bst_tlv), adc_bst_tlv),
SOC_DOUBLE_TLV("STO2 ADC Boost Gain", RT5645_ADC_BST_VOL1, SOC_DOUBLE_TLV("Mono ADC Boost Capture Volume", RT5645_ADC_BST_VOL2,
RT5645_STO2_ADC_L_BST_SFT, RT5645_STO2_ADC_R_BST_SFT, 3, 0, RT5645_MONO_ADC_L_BST_SFT, RT5645_MONO_ADC_R_BST_SFT, 3, 0,
adc_bst_tlv), adc_bst_tlv),
/* I2S2 function select */ /* I2S2 function select */

16
sound/soc/codecs/rt5645.h
View File

@ -39,8 +39,8 @@
#define RT5645_STO1_ADC_DIG_VOL 0x1c #define RT5645_STO1_ADC_DIG_VOL 0x1c
#define RT5645_MONO_ADC_DIG_VOL 0x1d #define RT5645_MONO_ADC_DIG_VOL 0x1d
#define RT5645_ADC_BST_VOL1 0x1e #define RT5645_ADC_BST_VOL1 0x1e
/* Mixer - D-D */
#define RT5645_ADC_BST_VOL2 0x20 #define RT5645_ADC_BST_VOL2 0x20
/* Mixer - D-D */
#define RT5645_STO1_ADC_MIXER 0x27 #define RT5645_STO1_ADC_MIXER 0x27
#define RT5645_MONO_ADC_MIXER 0x28 #define RT5645_MONO_ADC_MIXER 0x28
#define RT5645_AD_DA_MIXER 0x29 #define RT5645_AD_DA_MIXER 0x29
@ -315,12 +315,14 @@
#define RT5645_STO1_ADC_R_BST_SFT 12 #define RT5645_STO1_ADC_R_BST_SFT 12
#define RT5645_STO1_ADC_COMP_MASK (0x3 << 10) #define RT5645_STO1_ADC_COMP_MASK (0x3 << 10)
#define RT5645_STO1_ADC_COMP_SFT 10 #define RT5645_STO1_ADC_COMP_SFT 10
#define RT5645_STO2_ADC_L_BST_MASK (0x3 << 8)
#define RT5645_STO2_ADC_L_BST_SFT 8 /* ADC Boost Volume Control (0x20) */
#define RT5645_STO2_ADC_R_BST_MASK (0x3 << 6) #define RT5645_MONO_ADC_L_BST_MASK (0x3 << 14)
#define RT5645_STO2_ADC_R_BST_SFT 6 #define RT5645_MONO_ADC_L_BST_SFT 14
#define RT5645_STO2_ADC_COMP_MASK (0x3 << 4) #define RT5645_MONO_ADC_R_BST_MASK (0x3 << 12)
#define RT5645_STO2_ADC_COMP_SFT 4 #define RT5645_MONO_ADC_R_BST_SFT 12
#define RT5645_MONO_ADC_COMP_MASK (0x3 << 10)
#define RT5645_MONO_ADC_COMP_SFT 10
/* Stereo2 ADC Mixer Control (0x26) */ /* Stereo2 ADC Mixer Control (0x26) */
#define RT5645_STO2_ADC_SRC_MASK (0x1 << 15) #define RT5645_STO2_ADC_SRC_MASK (0x1 << 15)