[src/netbsd-7]: src Pull up following revision(s) (requested by msaitoh in ti...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bbe701f2f3d4
branches:  netbsd-7
changeset: 800032:bbe701f2f3d4
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Dec 08 08:03:59 2016 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1292):
        sys/dev/pci/pucdata.c: revisions 1.95-1.98
        share/man/man4/puc.4: revisions 1.39-40
Add three devices to puc(4):
- Add support for SystemBase SB16C1050 PCI serial card. PR#49819
  reported by Roberto E. Vargas Caballero.
- Add another Intel Q45 KT.
- Add Intel 100 Series Chipset KT.

diffstat:

 share/man/man4/puc.4  |   8 +++++---
 sys/dev/pci/pucdata.c |  37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 8 deletions(-)

diffs (129 lines):

diff -r 246d7011d6eb -r bbe701f2f3d4 share/man/man4/puc.4
--- a/share/man/man4/puc.4      Thu Dec 08 07:57:51 2016 +0000
+++ b/share/man/man4/puc.4      Thu Dec 08 08:03:59 2016 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.38 2012/10/26 11:43:43 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.38.8.1 2016/12/08 08:03:59 snj Exp $
 .\"
 .\" Copyright (c) 1998 Christopher G. Demetriou
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
 .\"
-.Dd October 26, 2012
+.Dd May 4, 2015
 .Dt PUC 4
 .Os
 .Sh NAME
@@ -165,6 +165,7 @@
 .It Tn "SUNIX 5099 (4 port serial and 1 port parallel)"
 .It Tn "Syba Tech Ltd. PCI-4S"
 .It Tn "Syba Tech Ltd. PCI-4S2P-550-ECP"
+.It Tn "SystemBase SB16C1050PCI (2 port serial)"
 .It Tn "SystemBase SB16C1054PCI (4 port serial)"
 .It Tn "SystemBase SB16C1058PCI (8 port serial)"
 .It Tn "US Robotics (3Com) 3CP5609 PCI 16550 Modem"
@@ -217,7 +218,8 @@
 .Sh AUTHORS
 The
 .Nm
-driver was written by Chris Demetriou.
+driver was written by
+.An Chris Demetriou .
 .Sh BUGS
 The current design of this driver keeps any
 .Nm com
diff -r 246d7011d6eb -r bbe701f2f3d4 sys/dev/pci/pucdata.c
--- a/sys/dev/pci/pucdata.c     Thu Dec 08 07:57:51 2016 +0000
+++ b/sys/dev/pci/pucdata.c     Thu Dec 08 08:03:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $     */
+/*     $NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj 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.93.4.1 2015/04/30 19:27:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -477,7 +477,7 @@
                { PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
            },
        },
- 
+
        /* Lava Computers 2SP-PCI */
        {   "Lava Computers 2SP-PCI parallel port",
            {   PCI_VENDOR_LAVA,        PCI_PRODUCT_LAVA_TWOSP_1P, 0, 0 },
@@ -1315,7 +1315,7 @@
        },
 
        {   "SUNIX 5008 1P",
-           {   PCI_VENDOR_SUNIX2,      PCI_PRODUCT_SUNIX2_SER5XXXX,
+           {   PCI_VENDOR_SUNIX2,      PCI_PRODUCT_SUNIX2_SER5XXXX,
                0x1fd4, 0x0100 },
            {   0xffff, 0xffff, 0xffff, 0xeff0 },
            {
@@ -1469,7 +1469,7 @@
        },
 
        /*
-        * Nanjing QinHeng Electronics 
+        * Nanjing QinHeng Electronics
         * Products based on CH353 chip which can be
         * configured to provide various combinations
         * including 2 serial ports and a parallel port
@@ -1857,6 +1857,14 @@
            },
        },
 
+       /* Intel Q45 KT (again) */
+       {   "Intel Q45 KT",
+           {   PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_KT_1, 0, 0 },
+           {   0xffff, 0xffff, 0,      0       },
+           {
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+           },
+       },
        /* Intel 5 Series and Intel 3400 Series KT */
        {   "Intel 5 Series KT",
            {   PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 },
@@ -1902,6 +1910,15 @@
            },
        },
 
+       /* Intel 100 Series KT */
+       {   "Intel 100 Series KT",
+           {   PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_KT, 0, 0 },
+           {   0xffff, 0xffff, 0,      0       },
+           {
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+           },
+       },
+
        /* Intel C600/X79 Series KT */
        {   "Intel C600/X79 Series KT",
            {   PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
@@ -2783,6 +2800,16 @@
            },
        },
 
+       /* SystemBase SB16C1050 UARTs */
+       {   "SystemBase SB16C1050",
+           {   PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1050, 0, 0 },
+           {   0xffff, 0xffff,                                          0, 0 },
+           {
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8},
+               { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8},
+           },
+       },
+
        /* SystemBase SB16C1054 UARTs */
        {   "SystemBase SB16C1054",
            {   PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },