[alsa-devel] [PATCH 1/3] ASoC: rt5651: add Volume to the name of volume control
add Volume to the name of volume control
Signed-off-by: Bard Liao bardliao@realtek.com --- sound/soc/codecs/rt5651.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 985852f..fe970ed 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -332,11 +332,11 @@ static const struct snd_kcontrol_new rt5651_snd_controls[] = { RT5651_L_VOL_SFT, RT5651_R_VOL_SFT, 175, 0, dac_vol_tlv), /* IN1/IN2/IN3 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5651_IN1_IN2, + SOC_SINGLE_TLV("IN1 Boost Volume", RT5651_IN1_IN2, RT5651_BST_SFT1, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5651_IN1_IN2, + SOC_SINGLE_TLV("IN2 Boost Volume", RT5651_IN1_IN2, RT5651_BST_SFT2, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN3 Boost", RT5651_IN3, + SOC_SINGLE_TLV("IN3 Boost Volume", RT5651_IN3, RT5651_BST_SFT1, 8, 0, bst_tlv), /* INL/INR Volume Control */ SOC_DOUBLE_TLV("IN Capture Volume", RT5651_INL1_INR1_VOL,
add Volume to the name of volume control.
Signed-off-by: Bard Liao bardliao@realtek.com --- sound/soc/codecs/rt5640.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 8bf8d36..2140157 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -407,11 +407,11 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = { RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 175, 0, dac_vol_tlv), /* IN1/IN2/IN3 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5640_IN1_IN2, + SOC_SINGLE_TLV("IN1 Boost Volume", RT5640_IN1_IN2, RT5640_BST_SFT1, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5640_IN3_IN4, + SOC_SINGLE_TLV("IN2 Boost Volume", RT5640_IN3_IN4, RT5640_BST_SFT2, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN3 Boost", RT5640_IN1_IN2, + SOC_SINGLE_TLV("IN3 Boost Volume", RT5640_IN1_IN2, RT5640_BST_SFT2, 8, 0, bst_tlv),
/* INL/INR Volume Control */
add Volume to the name of volume control.
Signed-off-by: Bard Liao bardliao@realtek.com --- sound/soc/codecs/rt5631.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index cf6dce6..e52e467 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -229,10 +229,10 @@ static SOC_ENUM_SINGLE_DECL(rt5631_spk_ratio_enum, RT5631_GEN_PUR_CTRL_REG, static const struct snd_kcontrol_new rt5631_snd_controls[] = { /* MIC */ SOC_ENUM("MIC1 Mode Control", rt5631_mic1_mode_enum), - SOC_SINGLE_TLV("MIC1 Boost", RT5631_MIC_CTRL_2, + SOC_SINGLE_TLV("MIC1 Boost Volume", RT5631_MIC_CTRL_2, RT5631_MIC1_BOOST_SHIFT, 8, 0, mic_bst_tlv), SOC_ENUM("MIC2 Mode Control", rt5631_mic2_mode_enum), - SOC_SINGLE_TLV("MIC2 Boost", RT5631_MIC_CTRL_2, + SOC_SINGLE_TLV("MIC2 Boost Volume", RT5631_MIC_CTRL_2, RT5631_MIC2_BOOST_SHIFT, 8, 0, mic_bst_tlv), /* MONO IN */ SOC_ENUM("MONOIN Mode Control", rt5631_monoin_mode_enum),
The patch
ASoC: rt5631: add Volume to the name of volume control
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From d77a760842751eb620a7e74f74e5a5ad6b3d6cef Mon Sep 17 00:00:00 2001
From: Bard Liao bardliao@realtek.com Date: Fri, 20 Jul 2018 09:48:20 +0800 Subject: [PATCH] ASoC: rt5631: add Volume to the name of volume control
add Volume to the name of volume control.
Signed-off-by: Bard Liao bardliao@realtek.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/rt5631.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index cf6dce69eb2a..e52e4670cf65 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -229,10 +229,10 @@ static SOC_ENUM_SINGLE_DECL(rt5631_spk_ratio_enum, RT5631_GEN_PUR_CTRL_REG, static const struct snd_kcontrol_new rt5631_snd_controls[] = { /* MIC */ SOC_ENUM("MIC1 Mode Control", rt5631_mic1_mode_enum), - SOC_SINGLE_TLV("MIC1 Boost", RT5631_MIC_CTRL_2, + SOC_SINGLE_TLV("MIC1 Boost Volume", RT5631_MIC_CTRL_2, RT5631_MIC1_BOOST_SHIFT, 8, 0, mic_bst_tlv), SOC_ENUM("MIC2 Mode Control", rt5631_mic2_mode_enum), - SOC_SINGLE_TLV("MIC2 Boost", RT5631_MIC_CTRL_2, + SOC_SINGLE_TLV("MIC2 Boost Volume", RT5631_MIC_CTRL_2, RT5631_MIC2_BOOST_SHIFT, 8, 0, mic_bst_tlv), /* MONO IN */ SOC_ENUM("MONOIN Mode Control", rt5631_monoin_mode_enum),
participants (2)
-
Bard Liao -
Mark Brown