|
|
@@ -397,8 +397,8 @@ static const struct snd_pci_quirk alc268_cfg_tbl[] = {
|
|
|
|
|
|
static const struct alc_config_preset alc268_presets[] = {
|
|
|
[ALC267_QUANTA_IL1] = {
|
|
|
- .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,
|
|
|
- alc268_capture_nosrc_mixer },
|
|
|
+ .mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },
|
|
|
+ .cap_mixer = alc268_capture_nosrc_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
|
|
|
alc267_quanta_il1_verbs },
|
|
|
.num_dacs = ARRAY_SIZE(alc268_dac_nids),
|
|
|
@@ -413,8 +413,8 @@ static const struct alc_config_preset alc268_presets[] = {
|
|
|
.init_hook = alc_inithook,
|
|
|
},
|
|
|
[ALC268_3ST] = {
|
|
|
- .mixers = { alc268_base_mixer, alc268_capture_alt_mixer,
|
|
|
- alc268_beep_mixer },
|
|
|
+ .mixers = { alc268_base_mixer, alc268_beep_mixer },
|
|
|
+ .cap_mixer = alc268_capture_alt_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs },
|
|
|
.num_dacs = ARRAY_SIZE(alc268_dac_nids),
|
|
|
.dac_nids = alc268_dac_nids,
|
|
|
@@ -428,8 +428,8 @@ static const struct alc_config_preset alc268_presets[] = {
|
|
|
.input_mux = &alc268_capture_source,
|
|
|
},
|
|
|
[ALC268_ACER] = {
|
|
|
- .mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,
|
|
|
- alc268_beep_mixer },
|
|
|
+ .mixers = { alc268_acer_mixer, alc268_beep_mixer },
|
|
|
+ .cap_mixer = alc268_capture_alt_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
|
|
|
alc268_acer_verbs },
|
|
|
.num_dacs = ARRAY_SIZE(alc268_dac_nids),
|
|
|
@@ -446,8 +446,8 @@ static const struct alc_config_preset alc268_presets[] = {
|
|
|
.init_hook = alc_inithook,
|
|
|
},
|
|
|
[ALC268_ACER_DMIC] = {
|
|
|
- .mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,
|
|
|
- alc268_beep_mixer },
|
|
|
+ .mixers = { alc268_acer_dmic_mixer, alc268_beep_mixer },
|
|
|
+ .cap_mixer = alc268_capture_alt_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
|
|
|
alc268_acer_verbs },
|
|
|
.num_dacs = ARRAY_SIZE(alc268_dac_nids),
|
|
|
@@ -464,9 +464,8 @@ static const struct alc_config_preset alc268_presets[] = {
|
|
|
.init_hook = alc_inithook,
|
|
|
},
|
|
|
[ALC268_ACER_ASPIRE_ONE] = {
|
|
|
- .mixers = { alc268_acer_aspire_one_mixer,
|
|
|
- alc268_beep_mixer,
|
|
|
- alc268_capture_nosrc_mixer },
|
|
|
+ .mixers = { alc268_acer_aspire_one_mixer, alc268_beep_mixer},
|
|
|
+ .cap_mixer = alc268_capture_nosrc_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
|
|
|
alc268_acer_aspire_one_verbs },
|
|
|
.num_dacs = ARRAY_SIZE(alc268_dac_nids),
|
|
|
@@ -483,7 +482,8 @@ static const struct alc_config_preset alc268_presets[] = {
|
|
|
},
|
|
|
#ifdef CONFIG_SND_DEBUG
|
|
|
[ALC268_TEST] = {
|
|
|
- .mixers = { alc268_test_mixer, alc268_capture_mixer },
|
|
|
+ .mixers = { alc268_test_mixer },
|
|
|
+ .cap_mixer = alc268_capture_mixer,
|
|
|
.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,
|
|
|
alc268_volume_init_verbs,
|
|
|
alc268_beep_init_verbs },
|
Takashi Iwai