OSDN Git Service

ASoC: alc5632: Fix Capture/Playback attributes for microphone inputs
authorPaul Fertser <fercerpav@gmail.com>
Sat, 11 Feb 2012 21:26:37 +0000 (23:26 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 11 Feb 2012 23:02:48 +0000 (23:02 +0000)
According to the mixer path diagram input sources' attenuators logically
belong to the playback path and DMIC boost only affects capture.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/alc5632.c

index b77f4e7..b347611 100644 (file)
@@ -177,17 +177,17 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
                        ALC5632_VOICE_DAC_VOL, 0, 63, 0, vdac_tlv),
        SOC_SINGLE("Voice DAC Playback Switch",
                        ALC5632_VOICE_DAC_VOL, 12, 1, 1),
-       SOC_SINGLE_TLV("Phone Capture Volume",
+       SOC_SINGLE_TLV("Phone Playback Volume",
                        ALC5632_PHONE_IN_VOL, 8, 31, 1, vol_tlv),
-       SOC_DOUBLE_TLV("LineIn Capture Volume",
+       SOC_DOUBLE_TLV("LineIn Playback Volume",
                        ALC5632_LINE_IN_VOL, 8, 0, 31, 1, vol_tlv),
        SOC_DOUBLE_TLV("Master Playback Volume",
                        ALC5632_STEREO_DAC_IN_VOL, 8, 0, 63, 1, vdac_tlv),
        SOC_DOUBLE("Master Playback Switch",
                        ALC5632_STEREO_DAC_IN_VOL, 15, 7, 1, 1),
-       SOC_SINGLE_TLV("Mic1 Capture Volume",
+       SOC_SINGLE_TLV("Mic1 Playback Volume",
                        ALC5632_MIC_VOL, 8, 31, 1, vol_tlv),
-       SOC_SINGLE_TLV("Mic2 Capture Volume",
+       SOC_SINGLE_TLV("Mic2 Playback Volume",
                        ALC5632_MIC_VOL, 0, 31, 1, vol_tlv),
        SOC_DOUBLE_TLV("Rec Capture Volume",
                        ALC5632_ADC_REC_GAIN, 8, 0, 31, 0, adc_rec_tlv),
@@ -195,7 +195,7 @@ static const struct snd_kcontrol_new alc5632_snd_controls[] = {
                        ALC5632_MIC_CTRL, 10, 3, 0, boost_tlv),
        SOC_SINGLE_TLV("Mic 2 Boost Volume",
                        ALC5632_MIC_CTRL, 8, 3, 0, boost_tlv),
-       SOC_SINGLE_TLV("DMIC Boost Volume",
+       SOC_SINGLE_TLV("DMIC Boost Capture Volume",
                        ALC5632_DIGI_BOOST_CTRL, 0, 7, 0, dig_tlv),
        SOC_SINGLE("DMIC En Capture Switch",
                        ALC5632_DIGI_BOOST_CTRL, 15, 1, 0),