From: Jacob Chen Date: Fri, 15 Jul 2016 01:43:16 +0000 (+0800) Subject: UPSTREAM: ASoC: rt5616: rename some alsa control names X-Git-Tag: firefly_0821_release~2140 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cbf9b1209cad91bb8e8514199692087ca8444b3a;p=firefly-linux-kernel-4.4.55.git UPSTREAM: ASoC: rt5616: rename some alsa control names Rename some alsa control name as what they should be. Signed-off-by: Bard Liao Signed-off-by: Mark Brown Bug: 25923642 Patchset: rt5616 audio (cherry picked from broonie/sound.git#for-next e2133b64820df302a8e3d00c7531018470cd63a9) Signed-off-by: Kees Cook Change-Id: I1d81031ddbe7ce5c38602c38ab643f893f436ef0 Signed-off-by: Jacob Chen --- diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index 7bb56dddff8e..1c10d8ed39d2 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -323,9 +323,9 @@ static const struct snd_kcontrol_new rt5616_snd_controls[] = { RT5616_L_VOL_SFT, RT5616_R_VOL_SFT, 175, 0, dac_vol_tlv), /* IN1/IN2 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5616_IN1_IN2, + SOC_SINGLE_TLV("IN1 Boost Volume", RT5616_IN1_IN2, RT5616_BST_SFT1, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5616_IN1_IN2, + SOC_SINGLE_TLV("IN2 Boost Volume", RT5616_IN1_IN2, RT5616_BST_SFT2, 8, 0, bst_tlv), /* INL/INR Volume Control */ SOC_DOUBLE_TLV("IN Capture Volume", RT5616_INL1_INR1_VOL, @@ -339,7 +339,7 @@ static const struct snd_kcontrol_new rt5616_snd_controls[] = { 127, 0, adc_vol_tlv), /* ADC Boost Volume Control */ - SOC_DOUBLE_TLV("ADC Boost Gain", RT5616_ADC_BST_VOL, + SOC_DOUBLE_TLV("ADC Boost Volume", RT5616_ADC_BST_VOL, RT5616_ADC_L_BST_SFT, RT5616_ADC_R_BST_SFT, 3, 0, adc_bst_tlv), };