Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1412095

Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree

Show all headers | View raw

The patch

   ASoC: cs53l30: Rename the volume controls for preamplifier

has been applied to the asoc tree at

   git://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 b97c4446817a88a3e5c85d6eed3e65693588c088 Mon Sep 17 00:00:00 2001
From: Nicolin Chen <nicoleotsuka@gmail.com>
Date: Tue, 31 May 2016 16:06:38 -0700
Subject: [PATCH] ASoC: cs53l30: Rename the volume controls for preamplifier

Volume controls should end with 'Volume', so this patch renames them for
ADC preamplifier.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/cs53l30.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 714e5799284f..9aff449e57af 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -331,10 +331,10 @@ static const struct snd_kcontrol_new cs53l30_snd_controls[] = {
 	SOC_SINGLE_TLV("ADC2 NG Boost Volume", CS53L30_ADC2_NG_CTL,
 		       CS53L30_ADCx_NG_BOOST_SHIFT, 1, 0, adc_ng_boost_tlv),
 
-	SOC_DOUBLE_R_TLV("ADC1 Pre Amp Gain", CS53L30_ADC1A_AFE_CTL,
+	SOC_DOUBLE_R_TLV("ADC1 Preamplifier Volume", CS53L30_ADC1A_AFE_CTL,
 			 CS53L30_ADC1B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
 			 2, 0, pga_preamp_tlv),
-	SOC_DOUBLE_R_TLV("ADC2 Pre Amp Gain", CS53L30_ADC2A_AFE_CTL,
+	SOC_DOUBLE_R_TLV("ADC2 Preamplifier Volume", CS53L30_ADC2A_AFE_CTL,
 			 CS53L30_ADC2B_AFE_CTL, CS53L30_ADCxy_PREAMP_SHIFT,
 			 2, 0, pga_preamp_tlv),
 
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] ASoC: cs53l30: Rename the volume controls for preamplifier Nicolin Chen <nicoleotsuka@gmail.com> - 2016-06-01 01:10 +0200
  [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() Nicolin Chen <nicoleotsuka@gmail.com> - 2016-06-01 01:10 +0200
    Re: [PATCH 2/2] ASoC: cs53l30: Check return value of regcache_sync() "Handrigan, Paul" <Paul.Handrigan@cirrus.com> - 2016-06-01 03:30 +0200
    Applied "ASoC: cs53l30: Check return value of regcache_sync()" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-02 12:20 +0200
  Re: [PATCH 1/2] ASoC: cs53l30: Rename the volume controls for  preamplifier "Handrigan, Paul" <Paul.Handrigan@cirrus.com> - 2016-06-01 03:30 +0200
  Applied "ASoC: cs53l30: Rename the volume controls for preamplifier" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-02 12:20 +0200

csiph-web