From c76279677c58cdcad81383f93477608980578b63 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 26 Feb 2004 14:54:44 -0500 Subject: [PATCH] Add Intel PCI ids to old-OSS driver i810_audio --- sound/oss/i810_audio.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c index ed4101e26e583..259d556af9ed5 100644 --- a/sound/oss/i810_audio.c +++ b/sound/oss/i810_audio.c @@ -120,9 +120,15 @@ #ifndef PCI_DEVICE_ID_INTEL_ICH5 #define PCI_DEVICE_ID_INTEL_ICH5 0x24d5 #endif +#ifndef PCI_DEVICE_ID_INTEL_ICH6_3 +#define PCI_DEVICE_ID_INTEL_ICH6_3 0x266e +#endif #ifndef PCI_DEVICE_ID_INTEL_440MX #define PCI_DEVICE_ID_INTEL_440MX 0x7195 #endif +#ifndef PCI_DEVICE_ID_INTEL_ESB_5 +#define PCI_DEVICE_ID_INTEL_ESB_5 0x25a6 +#endif #ifndef PCI_DEVICE_ID_SI_7012 #define PCI_DEVICE_ID_SI_7012 0x7012 #endif @@ -343,6 +349,11 @@ static struct pci_device_id i810_pci_tbl [] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD768}, {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_AC97, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD8111}, + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_5, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4}, + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_3, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4}, + {0,} }; @@ -2785,7 +2796,8 @@ static int i810_ac97_power_up_bus(struct i810_card *card) */ /* see i810_ac97_init for the next 7 lines (jsaw) */ inw(card->ac97base); - if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5) + if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 || + card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3) && (card->use_mmio)) { primary_codec_id = (int) readl(card->iobase_mmio + SDM) & 0x3; printk(KERN_INFO "i810_audio: Primary codec has ID %d\n", @@ -2855,7 +2867,8 @@ static int __devinit i810_ac97_init(struct i810_card *card) possible IO channels. Bit 0:1 of SDM then holds the last codec ID spoken to. */ - if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5) + if ((card->pci_id == PCI_DEVICE_ID_INTEL_ICH4 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH5 || + card->pci_id == PCI_DEVICE_ID_INTEL_ESB_5 || card->pci_id == PCI_DEVICE_ID_INTEL_ICH6_3) && (card->use_mmio)) { ac97_id = (int) readl(card->iobase_mmio + SDM) & 0x3; printk(KERN_INFO "i810_audio: Connection %d with codec id %d\n", -- 2.53.0