diff options
Diffstat (limited to 'sound/pci/hda/alc882_quirks.c')
-rw-r--r-- | sound/pci/hda/alc882_quirks.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c index 59c556d5203e..7f2a3a7a40b2 100644 --- a/sound/pci/hda/alc882_quirks.c +++ b/sound/pci/hda/alc882_quirks.c | |||
@@ -54,7 +54,6 @@ enum { | |||
54 | ALC888_ASUS_M90V, | 54 | ALC888_ASUS_M90V, |
55 | ALC888_ASUS_EEE1601, | 55 | ALC888_ASUS_EEE1601, |
56 | ALC889A_MB31, | 56 | ALC889A_MB31, |
57 | ALC1200_ASUS_P5Q, | ||
58 | ALC882_MODEL_LAST, | 57 | ALC882_MODEL_LAST, |
59 | }; | 58 | }; |
60 | 59 | ||
@@ -2798,7 +2797,6 @@ static const char * const alc882_models[ALC882_MODEL_LAST] = { | |||
2798 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", | 2797 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", |
2799 | [ALC889A_INTEL] = "intel-alc889a", | 2798 | [ALC889A_INTEL] = "intel-alc889a", |
2800 | [ALC889_INTEL] = "intel-x58", | 2799 | [ALC889_INTEL] = "intel-x58", |
2801 | [ALC1200_ASUS_P5Q] = "asus-p5q", | ||
2802 | [ALC889A_MB31] = "mb31", | 2800 | [ALC889A_MB31] = "mb31", |
2803 | [ALC882_AUTO] = "auto", | 2801 | [ALC882_AUTO] = "auto", |
2804 | }; | 2802 | }; |
@@ -2851,7 +2849,6 @@ static const struct snd_pci_quirk alc882_cfg_tbl[] = { | |||
2851 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), | 2849 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), |
2852 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), | 2850 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), |
2853 | SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), | 2851 | SND_PCI_QUIRK(0x1043, 0x8284, "Asus Z37E", ALC883_6ST_DIG), |
2854 | SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), | ||
2855 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), | 2852 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), |
2856 | 2853 | ||
2857 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), | 2854 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), |
@@ -3649,18 +3646,6 @@ static const struct alc_config_preset alc882_presets[] = { | |||
3649 | .unsol_event = alc_sku_unsol_event, | 3646 | .unsol_event = alc_sku_unsol_event, |
3650 | .init_hook = alc883_eee1601_inithook, | 3647 | .init_hook = alc883_eee1601_inithook, |
3651 | }, | 3648 | }, |
3652 | [ALC1200_ASUS_P5Q] = { | ||
3653 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | ||
3654 | .init_verbs = { alc883_init_verbs }, | ||
3655 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
3656 | .dac_nids = alc883_dac_nids, | ||
3657 | .dig_out_nid = ALC1200_DIGOUT_NID, | ||
3658 | .dig_in_nid = ALC883_DIGIN_NID, | ||
3659 | .slave_dig_outs = alc1200_slave_dig_outs, | ||
3660 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | ||
3661 | .channel_mode = alc883_sixstack_modes, | ||
3662 | .input_mux = &alc883_capture_source, | ||
3663 | }, | ||
3664 | [ALC889A_MB31] = { | 3649 | [ALC889A_MB31] = { |
3665 | .mixers = { alc889A_mb31_mixer, alc883_chmode_mixer}, | 3650 | .mixers = { alc889A_mb31_mixer, alc883_chmode_mixer}, |
3666 | .init_verbs = { alc883_init_verbs, alc889A_mb31_verbs, | 3651 | .init_verbs = { alc883_init_verbs, alc889A_mb31_verbs, |