add the VIA VX855 chipset

ok deraadt@

5 files changed, 19 insertions, 11 deletions

diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index 77f537b5131..bd3a80659ef 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pciide.4,v 1.81 2008/09/17 06:26:13 brad Exp $
+.\"	$OpenBSD: pciide.4,v 1.82 2009/06/26 02:46:27 kevlo Exp $
 .\"	$NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
 .\"
 .\" Copyright (c) 1998 Manuel Bouyer.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 17 2008 $
+.Dd $Mdocdate: June 26 2009 $
 .Dt PCIIDE 4
 .Os
 .Sh NAME
@@ -116,7 +116,7 @@ Silicon Integrated System 180, 181, 5513 (5597/5598), 540, 550,
 730, 733, 735, 740, 745, 746, 748, 750, 751, 752, 755, 760, 962, 963
 .It
 VIA Technologies CX700, VT82C586/A/B, VT82C596A/B, VT82C686A/B, VT8231, VT8366,
-VT8233, VT8235, VT8237, VT8237A/S, VT8251, VT6410, VX700
+VT8233, VT8235, VT8237, VT8237A/S, VT8251, VT6410, VX700, VX855
 .El
 .Pp
 Some of these controllers are only available in multifunction PCI chips.
diff --git a/share/man/man4/viapm.4 b/share/man/man4/viapm.4
index 85930d206e1..7f7de973db4 100644
--- a/share/man/man4/viapm.4
+++ b/share/man/man4/viapm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: viapm.4,v 1.7 2009/06/11 02:09:02 kevlo Exp $
+.\"	$OpenBSD: viapm.4,v 1.8 2009/06/26 02:46:27 kevlo Exp $
 .\"
 .\" Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 11 2009 $
+.Dd $Mdocdate: June 26 2009 $
 .Dt VIAPM 4
 .Os
 .Sh NAME
@@ -28,7 +28,7 @@ The
 .Nm
 driver provides support for the bus control and power management
 component of the VIA VT8233, VT8235, VT8237, VT8237A, VT8237S, VT8251,
-CX700 and CX800 South Bridges.
+CX700, CX800 and VX855 South Bridges.
 Only the SMBus host interface is supported and can be used with the
 .Xr iic 4
 framework.
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