diff options
author | Jason Gaston <jason.d.gaston@intel.com> | 2005-04-16 18:24:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:43 -0400 |
commit | c4c8ea948aa21527d502e87227b2f1d951bc506d (patch) | |
tree | e3c15c28614d6095fb10a0d18425cf6d9ea42de6 /sound | |
parent | d69332b875efb52ea5276d5638ce572fcd7375f2 (diff) |
[PATCH] intel8x0: AC'97 audio patch for Intel ESB2
This patch adds the Intel ESB2 DID's to the intel8x0.c file for AC'97 audio
support.
Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/intel8x0.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 0eb940da9d17..d143d2c78988 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -55,6 +55,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel,82801AA-ICH}," | |||
55 | "{Intel,ICH6}," | 55 | "{Intel,ICH6}," |
56 | "{Intel,ICH7}," | 56 | "{Intel,ICH7}," |
57 | "{Intel,6300ESB}," | 57 | "{Intel,6300ESB}," |
58 | "{Intel,ESB2}," | ||
58 | "{Intel,MX440}," | 59 | "{Intel,MX440}," |
59 | "{SiS,SI7012}," | 60 | "{SiS,SI7012}," |
60 | "{NVidia,nForce Audio}," | 61 | "{NVidia,nForce Audio}," |
@@ -124,6 +125,9 @@ MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 c | |||
124 | #ifndef PCI_DEVICE_ID_INTEL_ICH7_20 | 125 | #ifndef PCI_DEVICE_ID_INTEL_ICH7_20 |
125 | #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de | 126 | #define PCI_DEVICE_ID_INTEL_ICH7_20 0x27de |
126 | #endif | 127 | #endif |
128 | #ifndef PCI_DEVICE_ID_INTEL_ESB2_13 | ||
129 | #define PCI_DEVICE_ID_INTEL_ESB2_13 0x2698 | ||
130 | #endif | ||
127 | #ifndef PCI_DEVICE_ID_SI_7012 | 131 | #ifndef PCI_DEVICE_ID_SI_7012 |
128 | #define PCI_DEVICE_ID_SI_7012 0x7012 | 132 | #define PCI_DEVICE_ID_SI_7012 0x7012 |
129 | #endif | 133 | #endif |
@@ -443,6 +447,7 @@ static struct pci_device_id snd_intel8x0_ids[] = { | |||
443 | { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */ | 447 | { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */ |
444 | { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */ | 448 | { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */ |
445 | { 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */ | 449 | { 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */ |
450 | { 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */ | ||
446 | { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */ | 451 | { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */ |
447 | { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */ | 452 | { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */ |
448 | { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */ | 453 | { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */ |
@@ -2736,6 +2741,7 @@ static struct shortname_table { | |||
2736 | { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" }, | 2741 | { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" }, |
2737 | { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" }, | 2742 | { PCI_DEVICE_ID_INTEL_ICH6_18, "Intel ICH6" }, |
2738 | { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" }, | 2743 | { PCI_DEVICE_ID_INTEL_ICH7_20, "Intel ICH7" }, |
2744 | { PCI_DEVICE_ID_INTEL_ESB2_13, "Intel ESB2" }, | ||
2739 | { PCI_DEVICE_ID_SI_7012, "SiS SI7012" }, | 2745 | { PCI_DEVICE_ID_SI_7012, "SiS SI7012" }, |
2740 | { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" }, | 2746 | { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" }, |
2741 | { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" }, | 2747 | { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" }, |