]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ALSA: hda - Line In for Acer Inspire 6530G model
authorTony Vroon <tony@linx.net>
Fri, 26 Jun 2009 08:27:50 +0000 (09:27 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 29 Jun 2009 05:41:08 +0000 (07:41 +0200)
The Line In connector is set up as PIN_IN by default, using
VREF_HIZ. It is connected to both ADCs, so add it to both
input selectors.
Also add the ability to use the input mix (on a SoundBlaster
one would call this "What You Hear").

Signed-off-by: Tony Vroon <tony@linx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 2ed514030e75e214367726ddd895e65fc9ef1e63..08846d222cbe1cc2ac8b377b0f6061e522e63b5e 100644 (file)
@@ -1569,18 +1569,22 @@ static struct hda_input_mux alc888_2_capture_sources[2] = {
 static struct hda_input_mux alc888_acer_aspire_6530_sources[2] = {
        /* Interal mic only available on one ADC */
        {
-               .num_items = 3,
+               .num_items = 5,
                .items = {
                        { "Ext Mic", 0x0 },
+                       { "Line In", 0x2 },
                        { "CD", 0x4 },
+                       { "Input Mix", 0xa },
                        { "Int Mic", 0xb },
                },
        },
        {
-               .num_items = 2,
+               .num_items = 4,
                .items = {
                        { "Ext Mic", 0x0 },
+                       { "Line In", 0x2 },
                        { "CD", 0x4 },
+                       { "Input Mix", 0xa },
                },
        }
 };
@@ -8209,6 +8213,8 @@ static struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = {
        HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
        HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
        HDA_BIND_MUTE("LFE Playback Switch", 0x0f, 2, HDA_INPUT),
+       HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
+       HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),