summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKevin Lo <kevlo@cvs.openbsd.org>2009-06-26 02:46:28 +0000
committerKevin Lo <kevlo@cvs.openbsd.org>2009-06-26 02:46:28 +0000
commit3af4bc771e4e9023280fcfc34bdbba2e15b0429f (patch)
tree112a1f220bdb5b44fb8fadbd63e40d377f6bab5b /sys
parent256e16c8c98c507e33ebb0606c15a900b94bde60 (diff)
add the VIA VX855 chipset
ok deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/pcidevs4
-rw-r--r--sys/dev/pci/pciide.c9
-rw-r--r--sys/dev/pci/viapm.c5
3 files changed, 13 insertions, 5 deletions
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index f69ebca0b84..c4439f8811c 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1479 2009/06/23 21:07:02 sthen Exp $
+$OpenBSD: pcidevs,v 1.1480 2009/06/26 02:46:27 kevlo Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -5097,6 +5097,7 @@ product VIATECH VT8363_AGP 0x8305 VT8363 AGP
product VIATECH CX700_ISA 0x8324 CX700 ISA
product VIATECH VX800_ISA 0x8353 VX800 ISA
product VIATECH VT8371_PPB 0x8391 VT8371 PCI-PCI
+product VIATECH VX855_ISA 0x8409 VX855 ISA
product VIATECH VT8501_AGP 0x8501 VT8501 AGP
product VIATECH VT82C597AGP 0x8597 VT82C597 AGP
product VIATECH VT82C598AGP 0x8598 VT82C598 AGP
@@ -5122,6 +5123,7 @@ product VIATECH K8T890_PPB_C 0xc238 K8T890 PCI-PCI
product VIATECH P4M890_PPB_2 0xc327 P4M890 PCI-PCI
product VIATECH VX800_PCIE_0 0xc353 VX800 PCIE
product VIATECH P4M900_PPB_2 0xc364 P4M900 PCI-PCI
+product VIATECH VX855_IDE 0xc409 VX855 IDE
product VIATECH K8T890_PPB_D 0xd238 K8T890 PCI-PCI
product VIATECH K8T890_PPB_E 0xe238 K8T890 PCI-PCI
product VIATECH VX800_PCIE_1 0xe353 VX800 PCIE
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index d04fb19a0e6..68cc540df59 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.295 2009/05/31 04:42:16 jsg Exp $ */
+/* $OpenBSD: pciide.c,v 1.296 2009/06/26 02:46:27 kevlo Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -642,6 +642,10 @@ const struct pciide_product_desc pciide_via_products[] = {
0,
apollo_chip_map
},
+ { PCI_PRODUCT_VIATECH_VX855_IDE, /* VIA VX855 IDE */
+ 0,
+ apollo_chip_map
+ },
{ PCI_PRODUCT_VIATECH_VT6420_SATA, /* VIA VT6420 SATA */
0,
sata_chip_map
@@ -3050,7 +3054,8 @@ apollo_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT6410) ||
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_CX700_IDE) ||
- (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VX700_IDE)) {
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VX700_IDE) ||
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VX855_IDE)) {
printf(": ATA133");
sc->sc_wdcdev.UDMA_cap = 6;
} else {
diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c
index a2e108ea7ec..2c4b92a7c89 100644
--- a/sys/dev/pci/viapm.c
+++ b/sys/dev/pci/viapm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viapm.c,v 1.11 2009/06/11 02:09:03 kevlo Exp $ */
+/* $OpenBSD: viapm.c,v 1.12 2009/06/26 02:46:27 kevlo Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org>
@@ -133,7 +133,8 @@ const struct pci_matchid viapm_ids[] = {
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_ISA },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_ISA },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_CX700_ISA },
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX800_ISA }
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX800_ISA },
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VX855_ISA }
};
int