diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-07-21 20:41:52 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-07-21 20:41:52 +0000 |
| commit | 114b9ae02d3d7c4a9172abe107068c399dbc6008 (patch) | |
| tree | 203411e0e46eb3fcb9ffca1c69d62cb89241cffc /sys | |
| parent | 5ef6fc75c575edf19b6beaacd3c6a170ab12c8e7 (diff) | |
Do not check if CORBRPST is set for any chipsets.
From kent@NetBSD
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/azalia.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 41d81e842b1..3d33cfec384 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.22 2006/07/20 02:06:17 brad Exp $ */ +/* $OpenBSD: azalia.c,v 1.23 2006/07/21 20:41:51 brad Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -334,9 +334,10 @@ static const char *pin_devices[16] = { * ================================================================ */ #define PCI_ID_CODE0(v, p) PCI_ID_CODE(PCI_VENDOR_##v, PCI_PRODUCT_##v##_##p) -#define PCIID_MCP51 PCI_ID_CODE0(NVIDIA, MCP51_HDA) -#define PCIID_MCP55 PCI_ID_CODE0(NVIDIA, MCP55_HDA) -#define PCIID_M5461 PCI_ID_CODE0(ALI, M5461) +#define PCIID_NVIDIA_MCP51 PCI_ID_CODE0(NVIDIA, MCP51_HDA) +#define PCIID_NVIDIA_MCP55 PCI_ID_CODE0(NVIDIA, MCP55_HDA) +#define PCIID_ALI_M5461 PCI_ID_CODE0(ALI, M5461) +#define PCIID_VIATECH_HDA PCI_ID_CODE0(VIATECH, HDA) int azalia_pci_match(struct device *parent, void *match, void *aux) @@ -670,19 +671,6 @@ azalia_init_corb(azalia_t *az) /* reset CORBRP */ corbrp = AZ_READ_2(az, CORBRP); AZ_WRITE_2(az, CORBRP, corbrp | HDA_CORBRP_CORBRPRST); - for (i = 5000; i >= 0; i--) { - DELAY(10); - corbrp = AZ_READ_2(az, CORBRP); - if (corbrp & HDA_CORBRP_CORBRPRST) - break; - } - if (i <= 0 && - az->pciid != PCIID_MCP51 && - az->pciid != PCIID_MCP55 && - az->pciid != PCIID_M5461) { - printf("%s: CORBRP reset failure\n", XNAME(az)); - return -1; - } AZ_WRITE_2(az, CORBRP, corbrp & ~HDA_CORBRP_CORBRPRST); for (i = 5000; i >= 0; i--) { DELAY(10); @@ -691,7 +679,7 @@ azalia_init_corb(azalia_t *az) break; } if (i <= 0) { - printf("%s: CORBRP reset failure 2\n", XNAME(az)); + printf("%s: CORBRP reset failure\n", XNAME(az)); return -1; } DPRINTF(("%s: CORBWP=%d; size=%d\n", __func__, |