|
@@ -6993,46 +6993,6 @@ static struct snd_kcontrol_new alc888_3st_hp_mixer[] = {
|
|
{ } /* end */
|
|
{ } /* end */
|
|
};
|
|
};
|
|
|
|
|
|
-static struct snd_kcontrol_new alc888_6st_dell_mixer[] = {
|
|
|
|
- HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
|
|
|
- HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
|
|
|
- HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
|
|
|
|
- HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
|
|
|
|
- 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_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
|
|
|
|
- HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
|
|
|
|
- HDA_CODEC_VOLUME("Side Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
|
|
|
|
- HDA_BIND_MUTE("Side Playback Switch", 0x0f, 2, HDA_INPUT),
|
|
|
|
- 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_VOLUME("Mic Boost", 0x18, 0, 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_VOLUME("Front Mic Boost", 0x19, 0, 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),
|
|
|
|
- HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT),
|
|
|
|
- HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT),
|
|
|
|
- {
|
|
|
|
- .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
|
|
|
- /* .name = "Capture Source", */
|
|
|
|
- .name = "Input Source",
|
|
|
|
- .count = 2,
|
|
|
|
- .info = alc883_mux_enum_info,
|
|
|
|
- .get = alc883_mux_enum_get,
|
|
|
|
- .put = alc883_mux_enum_put,
|
|
|
|
- },
|
|
|
|
- { } /* end */
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
|
|
static struct snd_kcontrol_new alc883_acer_aspire_mixer[] = {
|
|
HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
|
HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
|
|
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
|
HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
|
|
@@ -7942,7 +7902,7 @@ static struct alc_config_preset alc883_presets[] = {
|
|
.input_mux = &alc883_capture_source,
|
|
.input_mux = &alc883_capture_source,
|
|
},
|
|
},
|
|
[ALC888_6ST_DELL] = {
|
|
[ALC888_6ST_DELL] = {
|
|
- .mixers = { alc888_6st_dell_mixer, alc883_chmode_mixer },
|
|
|
|
|
|
+ .mixers = { alc883_base_mixer, alc883_chmode_mixer },
|
|
.init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs },
|
|
.init_verbs = { alc883_init_verbs, alc888_6st_dell_verbs },
|
|
.num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
|
.num_dacs = ARRAY_SIZE(alc883_dac_nids),
|
|
.dac_nids = alc883_dac_nids,
|
|
.dac_nids = alc883_dac_nids,
|