UPSTREAM: ASoC: rt5616: rename some alsa control names
authorJacob Chen <jacob2.chen@rock-chips.com>
Fri, 15 Jul 2016 01:43:16 +0000 (09:43 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 18 Jul 2016 03:55:57 +0000 (11:55 +0800)
Rename some alsa control name as what they should be.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Bug: 25923642
Patchset: rt5616 audio

(cherry picked from broonie/sound.git#for-next e2133b64820df302a8e3d00c7531018470cd63a9)
Signed-off-by: Kees Cook <keescook@chromium.org>
Change-Id: I1d81031ddbe7ce5c38602c38ab643f893f436ef0
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
sound/soc/codecs/rt5616.c

index 7bb56dddff8e4f9c2f0ae4a01a49cdb88e7cd5d4..1c10d8ed39d2f342a47f610c7be36a25b1ef8a51 100644 (file)
@@ -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),
 };