Module Name: src
Committed By: martin
Date: Thu Jun 7 18:12:18 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: pcidevs pucdata.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #846):
sys/dev/pci/pcidevs: revision 1.1334
sys/dev/pci/pucdata.c: revision 1.102
add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card
To generate a diff of this commit:
cvs rdiff -u -r1.1289.2.6 -r1.1289.2.7 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.99.8.2 -r1.99.8.3 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1289.2.6 src/sys/dev/pci/pcidevs:1.1289.2.7
--- src/sys/dev/pci/pcidevs:1.1289.2.6 Wed Apr 18 14:20:25 2018
+++ src/sys/dev/pci/pcidevs Thu Jun 7 18:12:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.6 2018/04/18 14:20:25 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.7 2018/06/07 18:12:17 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -6250,6 +6250,7 @@ product OXFORDSEMI OXPCIE952_3 0xc140 OX
product OXFORDSEMI OXPCIE952_4 0xc141 OXPCIe952
product OXFORDSEMI OXPCIE952_5 0xc144 OXPCIe952
product OXFORDSEMI OXPCIE952_6 0xc145 OXPCIe952
+product OXFORDSEMI OXPCIE954 0xc208 OXPCIe954
/* Packet Engines products */
product PACKETENGINES GNICII 0x0911 G-NIC II Ethernet
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.99.8.2 src/sys/dev/pci/pucdata.c:1.99.8.3
--- src/sys/dev/pci/pucdata.c:1.99.8.2 Mon Apr 16 14:21:48 2018
+++ src/sys/dev/pci/pucdata.c Thu Jun 7 18:12:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.99.8.2 2018/04/16 14:21:48 martin Exp $ */
+/* $NetBSD: pucdata.c,v 1.99.8.3 2018/06/07 18:12:17 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.99.8.2 2018/04/16 14:21:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.99.8.3 2018/06/07 18:12:17 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1108,6 +1108,19 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor OXPCIe954 PCIe UARTs */
+ { "Oxford Semiconductor OXPCIe954 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
+ 0, 0 },
+ { 0xffff, 0xffff, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ },
+ },
+
/* Oxford Semiconductor OXmPCI952 PCI UARTs */
{ "Oxford Semiconductor OXmPCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,
