Module Name: src Committed By: hauke Date: Thu Nov 14 08:49:48 UTC 2019
Modified Files: src/sys/dev/pci: pucdata.c Log Message: The 16C1054 and 16C1058 serial multi-port controllers need a clock multiplier of 8, just like the 16C1050 controller. Verified with an ExSys EX-41388. ryo@ checked back with the hardware his original commit was based on, and confirmed the change. XXX Pull-up to netbsd-{7,8,9} To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 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/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.104 src/sys/dev/pci/pucdata.c:1.105 --- src/sys/dev/pci/pucdata.c:1.104 Thu May 2 21:33:12 2019 +++ src/sys/dev/pci/pucdata.c Thu Nov 14 08:49:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.104 2019/05/02 21:33:12 jdolecek Exp $ */ +/* $NetBSD: pucdata.c,v 1.105 2019/11/14 08:49:48 hauke 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.104 2019/05/02 21:33:12 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.105 2019/11/14 08:49:48 hauke Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2883,10 +2883,10 @@ const struct puc_device_description puc_ { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 }, }, }, @@ -2895,14 +2895,14 @@ const struct puc_device_description puc_ { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1058, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ }, - { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x10, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x18, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x20, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x28, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x30, COM_FREQ * 8 }, + { PUC_PORT_TYPE_COM, PCI_BAR0, 0x38, COM_FREQ * 8 }, }, },