Module Name: src
Committed By: martin
Date: Tue Apr 28 16:26:44 UTC 2020
Modified Files:
src/share/man/man4 [netbsd-9]: rtsx.4
src/sys/dev/pci [netbsd-9]: pcidevs rtsx_pci.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #864):
share/man/man4/rtsx.4: revision 1.6
sys/dev/pci/pcidevs: revision 1.1410
sys/dev/pci/rtsx_pci.c: revision 1.9
Add an eclectic mix of
GeForce GTX 680, RTS522A PCI-E Card Reader, intel wifi 9560
+ whitespace
Add support for Realtek RTS522A
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/share/man/man4/rtsx.4
cvs rdiff -u -r1.1383.2.6 -r1.1383.2.7 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/pci/rtsx_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/rtsx.4
diff -u src/share/man/man4/rtsx.4:1.5 src/share/man/man4/rtsx.4:1.5.4.1
--- src/share/man/man4/rtsx.4:1.5 Tue Apr 24 18:35:56 2018
+++ src/share/man/man4/rtsx.4 Tue Apr 28 16:26:43 2020
@@ -1,10 +1,10 @@
-.\" $NetBSD: rtsx.4,v 1.5 2018/04/24 18:35:56 maya Exp $
+.\" $NetBSD: rtsx.4,v 1.5.4.1 2020/04/28 16:26:43 martin Exp $
.\" $OpenBSD: rtsx.4,v 1.6 2014/05/18 10:52:17 stsp Exp $
.\"
.\" Theo de Raadt, 2006. Public Domain.
.\" Stefan Sperling, 2012. Public Domain.
.\"
-.Dd April 24, 2018
+.Dd April 27, 2020
.Dt RTSX 4
.Os
.Sh NAME
@@ -17,7 +17,7 @@
The
.Nm
driver provides support for the Realtek RTS5209, RTS5227, RTS5229,
-RTS525A, RTL8402, RTL8411 and RTL8411B SD card readers.
+RTS522A, RTS525A, RTL8402, RTL8411 and RTL8411B SD card readers.
.Pp
The
.Xr sdmmc 4
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1383.2.6 src/sys/dev/pci/pcidevs:1.1383.2.7
--- src/sys/dev/pci/pcidevs:1.1383.2.6 Thu Mar 19 19:13:33 2020
+++ src/sys/dev/pci/pcidevs Tue Apr 28 16:26:43 2020
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1383.2.6 2020/03/19 19:13:33 martin Exp $
+$NetBSD: pcidevs,v 1.1383.2.7 2020/04/28 16:26:43 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1109,7 +1109,7 @@ product AMD PCSCSI_PCI 0x2020 PCscsi-PC
product AMD GEODELX_PCHB 0x2080 Geode LX Host-PCI Bridge
product AMD GEODELX_VGA 0x2081 Geode LX VGA Controller
product AMD GEODELX_AES 0x2082 Geode LX AES Security Block
-product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge
+product AMD CS5536_PCISB 0x208f CS5536 GeodeLink PCI South Bridge
product AMD CS5536_PCIB 0x2090 CS5536 PCI-ISA Bridge
product AMD CS5536_FLASH 0x2091 CS5536 Flash
product AMD CS5536_AUDIO 0x2093 CS5536 Audio
@@ -5416,6 +5416,7 @@ product INTEL 100SERIES_LP_I2C_5 0x9d65
product INTEL 100SERIES_LP_UART_2 0x9d66 100 Series UART 2
product INTEL 100SERIES_LP_HDA 0x9d70 100 Series HD Audio
product INTEL 2HS_U_HDA 0x9d71 200 Series HD Audio
+product INTEL WIFI_LINK_9560_1 0x9df0 Dual Band Wireless AC 9560
product INTEL PINEVIEW_HB 0xa000 Pineview Host Bridge
product INTEL PINEVIEW_IGD 0xa001 Pineview Integrated Graphics Device
product INTEL PINEVIEW_IGD_1 0xa002 Pineview Integrated Graphics Device
@@ -6691,6 +6692,7 @@ product NVIDIA NVS_4200M2 0x1057 GeForce
product NVIDIA GEFORCE_610M 0x1058 GeForce 610M
product NVIDIA GEFORCE_610M2 0x1059 GeForce 610M
product NVIDIA GT610M 0x105A GeForce GT 610M
+product NVIDIA GF_GTX680 0x1180 GeForce GTX 680
product NVIDIA GF116 0x1244 GeForce GTX 550 Ti
product NVIDIA GF_GTX960 0x1401 GeForce GTX 960
product NVIDIA GF_GTX950 0x1402 GeForce GTX 950
@@ -7083,6 +7085,7 @@ product REALTEK RTS5208 0x5208 RTS5208
product REALTEK RTS5209 0x5209 RTS5209 PCI-E Card Reader
product REALTEK RTS5227 0x5227 RTS5227 PCI-E Card Reader
product REALTEK RTS5229 0x5229 RTS5229 PCI-E Card Reader
+product REALTEK RTS522A 0x522A RTS522A PCI-E Card Reader
product REALTEK RTS5249 0x5249 RTS5249 PCI-E Card Reader
product REALTEK RTS525A 0x525A RTS525A PCI-E Card Reader
product REALTEK RTL8402 0x5286 RTL8402 PCI-E Card Reader
Index: src/sys/dev/pci/rtsx_pci.c
diff -u src/sys/dev/pci/rtsx_pci.c:1.8 src/sys/dev/pci/rtsx_pci.c:1.8.4.1
--- src/sys/dev/pci/rtsx_pci.c:1.8 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/rtsx_pci.c Tue Apr 28 16:26:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: rtsx_pci.c,v 1.8.4.1 2020/04/28 16:26:44 martin Exp $ */
/* $OpenBSD: rtsx_pci.c,v 1.7 2014/08/19 17:55:03 phessler Exp $ */
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.8.4.1 2020/04/28 16:26:44 martin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -79,6 +79,7 @@ rtsx_pci_match(device_t parent, cfdata_t
case PCI_PRODUCT_REALTEK_RTS5209:
case PCI_PRODUCT_REALTEK_RTS5227:
case PCI_PRODUCT_REALTEK_RTS5229:
+ case PCI_PRODUCT_REALTEK_RTS522A:
case PCI_PRODUCT_REALTEK_RTS525A:
case PCI_PRODUCT_REALTEK_RTL8402:
case PCI_PRODUCT_REALTEK_RTL8411:
