leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: alc5632: rename volume/switch contols for master and speaker volumes.

Browse Source 
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>
This commit is contained in:
Andrey Danin 2011-11-13 21:53:13 +02:00 committed by Mark Brown
parent bb39753c2b
commit 1a083257eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/alc5632.c
View File

@ -226,10 +226,10 @@ static const DECLARE_TLV_DB_SCALE(vdac_tlv, -3525, 075, 0);
static const struct snd_kcontrol_new alc5632_vol_snd_controls[] = { static const struct snd_kcontrol_new alc5632_vol_snd_controls[] = {
/* left starts at bit 8, right at bit 0 */ /* left starts at bit 8, right at bit 0 */
/* 31 steps (5 bit), -46.5db scale */ /* 31 steps (5 bit), -46.5db scale */
SOC_DOUBLE_TLV("Line Playback Volume", SOC_DOUBLE_TLV("Speaker Playback Volume",
ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv), ALC5632_SPK_OUT_VOL, 8, 0, 31, 1, hp_tlv),
/* bit 15 mutes left, bit 7 right */ /* bit 15 mutes left, bit 7 right */
SOC_DOUBLE("Line Playback Switch", SOC_DOUBLE("Speaker Playback Switch",
ALC5632_SPK_OUT_VOL, 15, 7, 1, 1), ALC5632_SPK_OUT_VOL, 15, 7, 1, 1),
SOC_DOUBLE_TLV("Headphone Playback Volume", SOC_DOUBLE_TLV("Headphone Playback Volume",
ALC5632_HP_OUT_VOL, 8, 0, 31, 1, hp_tlv), ALC5632_HP_OUT_VOL, 8, 0, 31, 1, hp_tlv),
@ -248,9 +248,9 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv), ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv),
SOC_DOUBLE_TLV("LineIn Capture Volume", SOC_DOUBLE_TLV("LineIn Capture Volume",
ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv), ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv),
SOC_DOUBLE_TLV("Stereo DAC Playback Volume", SOC_DOUBLE_TLV("Master Playback Volume",
ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv), ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv),
SOC_DOUBLE("Stereo DAC Playback Switch", SOC_DOUBLE("Master Playback Switch",
ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1), ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1),
SOC_SINGLE_TLV("Mic1 Capture Volume", SOC_SINGLE_TLV("Mic1 Capture Volume",
ALC5632_MIC_VOL, 8, 31, 1, vol_tlv), ALC5632_MIC_VOL, 8, 31, 1, vol_tlv),