aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAndrey Danin <danindrey@mail.ru>2011-11-13 14:53:13 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-16 05:43:28 -0500
commit1a083257eb95af8e1d6e0d03e960c34f0017ad31 (patch)
tree31735ec5d7d4e7d5bfcc0f5578e370de18b0935a /sound/soc
parentbb39753c2ba69d4d9467a109b03861cf43a6dcf8 (diff)
ASoC: alc5632: rename volume/switch contols for master and speaker volumes.
Signed-off-by: Andrey Danin <danindrey@mail.ru> Signed-off-by: Leon Romanovsky <leon@leon.nu> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/alc5632.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c
index c5055c1a2d55..6bfbbc71154d 100644
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -226,10 +226,10 @@ static const DECLARE_TLV_DB_SCALE(vdac_tlv, -3525, 075, 0);
226static const struct snd_kcontrol_new alc5632_vol_snd_controls[] = { 226static const struct snd_kcontrol_new alc5632_vol_snd_controls[] = {
227 /* left starts at bit 8, right at bit 0 */ 227 /* left starts at bit 8, right at bit 0 */
228 /* 31 steps (5 bit), -46.5db scale */ 228 /* 31 steps (5 bit), -46.5db scale */
229 SOC_DOUBLE_TLV("Line Playback Volume", 229 SOC_DOUBLE_TLV("Speaker Playback Volume",
230 ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv), 230 ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),
231 /* bit 15 mutes left, bit 7 right */ 231 /* bit 15 mutes left, bit 7 right */
232 SOC_DOUBLE("Line Playback Switch", 232 SOC_DOUBLE("Speaker Playback Switch",
233 ALC5632_SPK_OUT_VOL, 15, 7, 1, 1), 233 ALC5632_SPK_OUT_VOL, 15, 7, 1, 1),
234 SOC_DOUBLE_TLV("Headphone Playback Volume", 234 SOC_DOUBLE_TLV("Headphone Playback Volume",
235 ALC5632_HP_OUT_VOL, 8, 0, 31, 1, hp_tlv), 235 ALC5632_HP_OUT_VOL, 8, 0, 31, 1, hp_tlv),
@@ -248,9 +248,9 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
248 ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv), 248 ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv),
249 SOC_DOUBLE_TLV("LineIn Capture Volume", 249 SOC_DOUBLE_TLV("LineIn Capture Volume",
250 ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv), 250 ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv),
251 SOC_DOUBLE_TLV("Stereo DAC Playback Volume", 251 SOC_DOUBLE_TLV("Master Playback Volume",
252 ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv), 252 ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv),
253 SOC_DOUBLE("Stereo DAC Playback Switch", 253 SOC_DOUBLE("Master Playback Switch",
254 ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1), 254 ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1),
255 SOC_SINGLE_TLV("Mic1 Capture Volume", 255 SOC_SINGLE_TLV("Mic1 Capture Volume",
256 ALC5632_MIC_VOL, 8, 31, 1, vol_tlv), 256 ALC5632_MIC_VOL, 8, 31, 1, vol_tlv),