diff options
author | Wu Fengguang <wfg@linux.intel.com> | 2008-11-17 03:51:09 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-17 03:51:09 -0500 |
commit | 3ab909351a3c653a879a35b3342979ac483c0460 (patch) | |
tree | 0a46c6f8954c400d80ae57d883e610d459ddd138 /sound | |
parent | e2da9ba570418fb4061f0a5cfe4338be6470c02b (diff) |
ALSA: hda: alc883 model for ASUS P5Q-EM boards
Add a new alc883 model ALC1200_ASUS_P5Q for ASUS P5Q-EM boards.
It is the same as ALC883_6ST_DIG except that the SPDIF digital
output nid is 0x10.
Tested-by: Andrei Tanas <andrei@tanas.ca>
Signed-off-by: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 017abd01299d..04e153a77dbc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -232,6 +232,7 @@ enum { | |||
232 | ALC883_3ST_6ch_INTEL, | 232 | ALC883_3ST_6ch_INTEL, |
233 | ALC888_ASUS_M90V, | 233 | ALC888_ASUS_M90V, |
234 | ALC888_ASUS_EEE1601, | 234 | ALC888_ASUS_EEE1601, |
235 | ALC1200_ASUS_P5Q, | ||
235 | ALC883_AUTO, | 236 | ALC883_AUTO, |
236 | ALC883_MODEL_LAST, | 237 | ALC883_MODEL_LAST, |
237 | }; | 238 | }; |
@@ -6868,6 +6869,8 @@ static int patch_alc882(struct hda_codec *codec) | |||
6868 | #define ALC883_DIGOUT_NID 0x06 | 6869 | #define ALC883_DIGOUT_NID 0x06 |
6869 | #define ALC883_DIGIN_NID 0x0a | 6870 | #define ALC883_DIGIN_NID 0x0a |
6870 | 6871 | ||
6872 | #define ALC1200_DIGOUT_NID 0x10 | ||
6873 | |||
6871 | static hda_nid_t alc883_dac_nids[4] = { | 6874 | static hda_nid_t alc883_dac_nids[4] = { |
6872 | /* front, rear, clfe, rear_surr */ | 6875 | /* front, rear, clfe, rear_surr */ |
6873 | 0x02, 0x03, 0x04, 0x05 | 6876 | 0x02, 0x03, 0x04, 0x05 |
@@ -8190,6 +8193,7 @@ static const char *alc883_models[ALC883_MODEL_LAST] = { | |||
8190 | [ALC883_CLEVO_M720] = "clevo-m720", | 8193 | [ALC883_CLEVO_M720] = "clevo-m720", |
8191 | [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515", | 8194 | [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515", |
8192 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", | 8195 | [ALC883_3ST_6ch_INTEL] = "3stack-6ch-intel", |
8196 | [ALC1200_ASUS_P5Q] = "asus-p5q", | ||
8193 | [ALC883_AUTO] = "auto", | 8197 | [ALC883_AUTO] = "auto", |
8194 | }; | 8198 | }; |
8195 | 8199 | ||
@@ -8208,6 +8212,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { | |||
8208 | SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), | 8212 | SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), |
8209 | SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), | 8213 | SND_PCI_QUIRK(0x1043, 0x1873, "Asus M90V", ALC888_ASUS_M90V), |
8210 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), | 8214 | SND_PCI_QUIRK(0x1043, 0x8249, "Asus M2A-VM HDMI", ALC883_3ST_6ch_DIG), |
8215 | SND_PCI_QUIRK(0x1043, 0x82fe, "Asus P5Q-EM HDMI", ALC1200_ASUS_P5Q), | ||
8211 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), | 8216 | SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601), |
8212 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), | 8217 | SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG), |
8213 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG), | 8218 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG), |
@@ -8555,6 +8560,17 @@ static struct alc_config_preset alc883_presets[] = { | |||
8555 | .unsol_event = alc883_eee1601_unsol_event, | 8560 | .unsol_event = alc883_eee1601_unsol_event, |
8556 | .init_hook = alc883_eee1601_inithook, | 8561 | .init_hook = alc883_eee1601_inithook, |
8557 | }, | 8562 | }, |
8563 | [ALC1200_ASUS_P5Q] = { | ||
8564 | .mixers = { alc883_base_mixer, alc883_chmode_mixer }, | ||
8565 | .init_verbs = { alc883_init_verbs }, | ||
8566 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
8567 | .dac_nids = alc883_dac_nids, | ||
8568 | .dig_out_nid = ALC1200_DIGOUT_NID, | ||
8569 | .dig_in_nid = ALC883_DIGIN_NID, | ||
8570 | .num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes), | ||
8571 | .channel_mode = alc883_sixstack_modes, | ||
8572 | .input_mux = &alc883_capture_source, | ||
8573 | }, | ||
8558 | }; | 8574 | }; |
8559 | 8575 | ||
8560 | 8576 | ||