ALSA CVS update - Clemens Ladisch <clemens@ladisch.de>

Intel8x0 driver
add Intel ICH6 and ESB

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 709d02a4ededd7cf1b0c72583f365478f496b015..a4476c5cfecdfd930b2e9f83242ef9a276c546c9 100644 (file)
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -55,6 +55,8 @@ MODULE_DEVICES("{{Intel,82801AA-ICH},"
                "{Intel,82801CA-ICH3},"
                "{Intel,82801DB-ICH4},"
                "{Intel,ICH5},"
+               "{Intel,ICH6},"
+               "{Intel,6300ESB},"
                "{Intel,MX440},"
                "{SiS,SI7012},"
                "{NVidia,nForce Audio},"
@@ -131,6 +133,12 @@ MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED ",allows:{{0},{0x330},{0x300}},dialog
 #ifndef PCI_DEVICE_ID_INTEL_ICH5
 #define PCI_DEVICE_ID_INTEL_ICH5       0x24d5
 #endif
+#ifndef PCI_DEVICE_ID_INTEL_ESB_5
+#define PCI_DEVICE_ID_INTEL_ESB_5      0x25a6
+#endif
+#ifndef PCI_DEVICE_ID_INTEL_ICH6_3
+#define PCI_DEVICE_ID_INTEL_ICH6_3     0x266e
+#endif
 #ifndef PCI_DEVICE_ID_SI_7012
 #define PCI_DEVICE_ID_SI_7012          0x7012
 #endif
@@ -447,6 +455,8 @@ static struct pci_device_id snd_intel8x0_ids[] = {
        { 0x8086, 0x2485, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
        { 0x8086, 0x24c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH4 */
        { 0x8086, 0x24d5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH5 */
+       { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
+       { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
        { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
        { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS },   /* SI7012 */
        { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },        /* NFORCE */
@@ -2595,6 +2605,8 @@ static struct shortname_table {
        { PCI_DEVICE_ID_INTEL_ICH3, "Intel 82801CA-ICH3" },
        { PCI_DEVICE_ID_INTEL_ICH4, "Intel 82801DB-ICH4" },
        { PCI_DEVICE_ID_INTEL_ICH5, "Intel ICH5" },
+       { PCI_DEVICE_ID_INTEL_ESB_5, "Intel 6300ESB" },
+       { PCI_DEVICE_ID_INTEL_ICH6_3, "Intel ICH6" },
        { PCI_DEVICE_ID_SI_7012, "SiS SI7012" },
        { PCI_DEVICE_ID_NVIDIA_MCP_AUDIO, "NVidia nForce" },
        { PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, "NVidia nForce2" },