summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2005-08-10 15:28:36 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2005-08-10 15:28:36 +0000
commitae264203523c394f7232ef648aa990d05e0d2e66 (patch)
tree969eb4671a160c2909829935920ef60c235c659a /sys
parent3e8e1784a5ceff3ea1e38dd5102b41f1846ec2cb (diff)
Some additional ICH7 bits which aren't strictly necessary to work
but are desireable. Tested by Mark Peoples, ok mickey@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/auich.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 04a5a882d67..68a751466f3 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.55 2005/08/09 04:10:10 mickey Exp $ */
+/* $OpenBSD: auich.c,v 1.56 2005/08/10 15:28:35 jsg Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -59,9 +59,9 @@
#define AUICH_NABMBAR 0x14
#define AUICH_CFG 0x41
#define AUICH_CFG_IOSE 0x01
-/* ICH4/ICH5/ICH6 native audio mixer BAR */
+/* ICH4/ICH5/ICH6/ICH7 native audio mixer BAR */
#define AUICH_MMBAR 0x18
-/* ICH4/ICH5/ICH6 native bus mastering BAR */
+/* ICH4/ICH5/ICH6/ICH7 native bus mastering BAR */
#define AUICH_MBBAR 0x1c
#define AUICH_S2CR 0x10000000 /* tertiary codec ready */
@@ -354,9 +354,10 @@ auich_attach(parent, self, aux)
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801DB_ACA ||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801EB_ACA ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801FB_ACA)) {
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801FB_ACA ||
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801GB_ACA)) {
/*
- * Use native mode for ICH4/ICH5/ICH6
+ * Use native mode for ICH4/ICH5/ICH6/ICH7
*/
if (pci_mapreg_map(pa, AUICH_MMBAR, PCI_MAPREG_TYPE_MEM, 0,
&sc->iot_mix, &sc->mix_ioh, NULL, &mix_size, 0)) {
@@ -499,7 +500,8 @@ auich_attach(parent, self, aux)
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801DB_ACA ||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801EB_ACA ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801FB_ACA)) {
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801FB_ACA ||
+ PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_82801GB_ACA)) {
/* MSI 845G Max never return AUICH_PCR */
sc->sc_ignore_codecready = 1;
} else {