Commit c07584c8 authored by Tobin Davis's avatar Tobin Davis Committed by Jaroslav Kysela

[ALSA] hda-codec - Add support for Medion laptops

This patch adds audio support for Medion's line of laptops,
based on code shipped with the laptops.  Microphone support is
still being explored.
Signed-off-by: default avatarTobin Davis <tdavis@dsl-only.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 734c2d4b
...@@ -817,6 +817,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ...@@ -817,6 +817,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
3stack-6ch-dig 3-jack 6-channel with SPDIF I/O 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
6stack-dig-demo 6-jack digital for Intel demo board 6stack-dig-demo 6-jack digital for Intel demo board
acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
medion Medion Laptops
auto auto-config reading BIOS (default) auto auto-config reading BIOS (default)
ALC861/660 ALC861/660
......
...@@ -112,6 +112,7 @@ enum { ...@@ -112,6 +112,7 @@ enum {
ALC883_6ST_DIG, ALC883_6ST_DIG,
ALC888_DEMO_BOARD, ALC888_DEMO_BOARD,
ALC883_ACER, ALC883_ACER,
ALC883_MEDION,
ALC883_AUTO, ALC883_AUTO,
ALC883_MODEL_LAST, ALC883_MODEL_LAST,
}; };
...@@ -4309,7 +4310,7 @@ static struct hda_verb alc882_init_verbs[] = { ...@@ -4309,7 +4310,7 @@ static struct hda_verb alc882_init_verbs[] = {
static struct hda_verb alc882_eapd_verbs[] = { static struct hda_verb alc882_eapd_verbs[] = {
/* change to EAPD mode */ /* change to EAPD mode */
{0x20, AC_VERB_SET_COEF_INDEX, 0x07}, {0x20, AC_VERB_SET_COEF_INDEX, 0x07},
{0x20, AC_VERB_SET_PROC_COEF, 0x3060}, {0x20, AC_VERB_SET_PROC_COEF, 0x3070},
{ } { }
}; };
...@@ -4875,6 +4876,41 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = { ...@@ -4875,6 +4876,41 @@ static struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = {
{ } /* end */ { } /* end */
}; };
static snd_kcontrol_new_t alc883_fivestack_mixer[] = {
HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x16, 1, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, 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("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT),
HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT),
HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
/* .name = "Capture Source", */
.name = "Input Source",
.count = 1,
.info = alc883_mux_enum_info,
.get = alc883_mux_enum_get,
.put = alc883_mux_enum_put,
},
{ } /* end */
};
static struct snd_kcontrol_new alc883_chmode_mixer[] = { static struct snd_kcontrol_new alc883_chmode_mixer[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
...@@ -5082,6 +5118,8 @@ static struct hda_board_config alc883_cfg_tbl[] = { ...@@ -5082,6 +5118,8 @@ static struct hda_board_config alc883_cfg_tbl[] = {
.config = ALC883_ACER }, .config = ALC883_ACER },
{ .pci_subvendor = 0x1025, .pci_subdevice = 0x009f, { .pci_subvendor = 0x1025, .pci_subdevice = 0x009f,
.config = ALC883_ACER }, .config = ALC883_ACER },
{ .pci_subvendor = 0x161f, .pci_subdevice = 0x2054,
.modelname = "medion", .config = ALC883_MEDION }
{ .modelname = "auto", .config = ALC883_AUTO }, { .modelname = "auto", .config = ALC883_AUTO },
{} {}
}; };
...@@ -5169,6 +5207,20 @@ static struct alc_config_preset alc883_presets[] = { ...@@ -5169,6 +5207,20 @@ static struct alc_config_preset alc883_presets[] = {
.channel_mode = alc883_3ST_2ch_modes, .channel_mode = alc883_3ST_2ch_modes,
.input_mux = &alc883_capture_source, .input_mux = &alc883_capture_source,
}, },
[ALC883_MEDION] = {
.mixers = { alc883_fivestack_mixer,
alc883_chmode_mixer },
.init_verbs = { alc883_init_verbs,
alc882_eapd_verbs },
.num_dacs = ARRAY_SIZE(alc883_dac_nids),
.dac_nids = alc883_dac_nids,
.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
.adc_nids = alc883_adc_nids,
.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
.channel_mode = alc883_sixstack_modes,
.input_mux = &alc883_capture_source,
}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment