regen

2 files changed, 273 insertions, 7 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 00acf4c723d..bf2137af331 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.662 2015/05/12 11:15:17 stsp Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.663 2015/06/16 05:07:54 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.650 2015/05/12 11:14:06 stsp Exp 
+ *	OpenBSD: usbdevs,v 1.651 2015/06/16 05:07:25 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -359,6 +359,7 @@
 #define	USB_VENDOR_MSYSTEMS	0x08ec		/* M-Systems */
 #define	USB_VENDOR_DIGIANSWER	0x08fd		/* Digianswer */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec */
+#define	USB_VENDOR_SIEMENS4	0x0908		/* Siemens */
 #define	USB_VENDOR_AUDIOTECHNICA	0x0909		/* Audio-Technica */
 #define	USB_VENDOR_TRUMPION	0x090a		/* Trumpion Microelectronics */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems */
@@ -469,6 +470,7 @@
 #define	USB_VENDOR_XIRING	0x0f14		/* XIRING */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
 #define	USB_VENDOR_LARSENBRUSGAARD	0x0fd8		/* Larsen and Brusgaard */
+#define	USB_VENDOR_OREGONSCI	0x0fde		/* Oregon Scientific */
 #define	USB_VENDOR_UNKNOWN4	0x0fe6		/* Unknown Vendor */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications */
@@ -485,7 +487,7 @@
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_HYUNDAI	0x106c		/* Hyundai */
 #define	USB_VENDOR_GCTSEMICON	0x1076		/* GCT Semiconductor */
-#define	USB_VENDOR_SILABS2	0x10a6		/* SILABS2 */
+#define	USB_VENDOR_SILABS2	0x10a6		/* Silicon Labs */
 #define	USB_VENDOR_USI	0x10ab		/* USI */
 #define	USB_VENDOR_LIEBERT2	0x10af		/* Liebert */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
@@ -561,6 +563,7 @@
 #define	USB_VENDOR_CISCOLINKSYS2	0x167b		/* Cisco-Linksys */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
 #define	USB_VENDOR_GLOBALSUN	0x16ab		/* Global Sun Technology */
+#define	USB_VENDOR_VOTI	0x16c0		/* Van Ooijen Technische Informatica */
 #define	USB_VENDOR_ANYDATA	0x16d5		/* AnyDATA Inc. */
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_CMOTECH	0x16d8		/* CMOTECH */
@@ -589,6 +592,9 @@
 #define	USB_VENDOR_ABBOTT	0x1a61		/* Abbott Labs */
 #define	USB_VENDOR_BAYER	0x1a79		/* Bayer Health Care */
 #define	USB_VENDOR_WCH2	0x1a86		/* QinHeng Electronics */
+#define	USB_VENDOR_SEL	0x1adb		/* Schweitzer Engineering Laboratories */
+#define	USB_VENDOR_SILABS5	0x1ba4		/* Silicon Labs */
+#define	USB_VENDOR_CORSAIR	0x1b1c		/* Corsair */
 #define	USB_VENDOR_MATRIXORB	0x1b3d		/* Matrix Orbital */
 #define	USB_VENDOR_TORADEX	0x1b67		/* Toradex inc. */
 #define	USB_VENDOR_OVISLINK	0x1b75		/* OvisLink */
@@ -602,11 +608,13 @@
 #define	USB_VENDOR_DRESDENELEC	0x1cf1		/* Dresden Elektronic */
 #define	USB_VENDOR_DREAMLINK	0x1d34		/* Dream Link */
 #define	USB_VENDOR_PEGATRON	0x1d4d		/* Pegatron */
+#define	USB_VENDOR_SELUXIT	0x1d6f		/* Seluxit */
 #define	USB_VENDOR_METAGEEK	0x1dd5		/* MetaGeek */
 #define	USB_VENDOR_FESTO	0x1e29		/* Festo */
 #define	USB_VENDOR_MODACOM	0x1eb8		/* Modacom */
 #define	USB_VENDOR_AIRTIES	0x1eda		/* AirTies */
 #define	USB_VENDOR_VERTEX	0x1fe7		/* Vertex Wireless Co., Ltd. */
+#define	USB_VENDOR_LAKESHORE	0x1fb9		/* Lake Shore */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
 #define	USB_VENDOR_ENCORE	0x203d		/* Encore */
@@ -618,6 +626,7 @@
 #define	USB_VENDOR_MOTOROLA2	0x22b8		/* Motorola */
 #define	USB_VENDOR_ARDUINO	0x2341		/* Arduino SA */
 #define	USB_VENDOR_TPLINK	0x2357		/* TP-Link */
+#define	USB_VENDOR_WMR	0x2405		/* West Mountain Radio */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
 #define	USB_VENDOR_ASUSTEK	0x2821		/* ASUSTeK Computer */
@@ -1402,6 +1411,9 @@
 #define	USB_PRODUCT_COREGA_WLUSB_11_STICK	0x7613		/* WLAN USB Stick 11 */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TXC	0x9601		/* FEther USB-TXC */
 
+/* Corsair products */
+#define	USB_PRODUCT_CORSAIR_CP210X	0x1c00		/* CP210X */
+
 /* Creative Labs products */
 #define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II */
 #define	USB_PRODUCT_CREATIVE_NOMAD_IIMG	0x4004		/* Nomad II MG */
@@ -2440,6 +2452,27 @@
 #define	USB_PRODUCT_LACIE_HD	0xa601		/* Hard Disk */
 #define	USB_PRODUCT_LACIE_CDRW	0xa602		/* CD R/W */
 
+/* Lake Shore products */
+#define	USB_PRODUCT_LAKESHORE_M121	0x0100		/* Model 121 */
+#define	USB_PRODUCT_LAKESHORE_M218A	0x0200		/* Model 218A */
+#define	USB_PRODUCT_LAKESHORE_M219	0x0201		/* Model 219 */
+#define	USB_PRODUCT_LAKESHORE_M233	0x0202		/* Model 233 */
+#define	USB_PRODUCT_LAKESHORE_M235	0x0203		/* Model 235 */
+#define	USB_PRODUCT_LAKESHORE_M335	0x0300		/* Model 335 */
+#define	USB_PRODUCT_LAKESHORE_M336	0x0301		/* Model 336 */
+#define	USB_PRODUCT_LAKESHORE_M350	0x0302		/* Model 350 */
+#define	USB_PRODUCT_LAKESHORE_M371	0x0303		/* Model 371 */
+#define	USB_PRODUCT_LAKESHORE_M411	0x0400		/* Model 411 */
+#define	USB_PRODUCT_LAKESHORE_M425	0x0401		/* Model 425 */
+#define	USB_PRODUCT_LAKESHORE_M455A	0x0402		/* Model 455A */
+#define	USB_PRODUCT_LAKESHORE_M475A	0x0403		/* Model 475A */
+#define	USB_PRODUCT_LAKESHORE_M465	0x0404		/* Model 465 */
+#define	USB_PRODUCT_LAKESHORE_M625A	0x0600		/* Model 625A */
+#define	USB_PRODUCT_LAKESHORE_M642A	0x0601		/* Model 642A */
+#define	USB_PRODUCT_LAKESHORE_M648	0x0602		/* Model 648 */
+#define	USB_PRODUCT_LAKESHORE_M737	0x0700		/* Model 737 */
+#define	USB_PRODUCT_LAKESHORE_M776	0x0701		/* Model 776 */
+
 /* Larsen and Brusgaard products */
 #define	USB_PRODUCT_LARSENBRUSGAARD_ALTITRACK	0x0001		/* AltiTrack */
 
@@ -3092,6 +3125,7 @@
 #define	USB_PRODUCT_NETGEAR_EA101X	0x1002		/* Ethernet */
 #define	USB_PRODUCT_NETGEAR_FA101	0x1020		/* 10/100 Ethernet */
 #define	USB_PRODUCT_NETGEAR_FA120	0x1040		/* USB 2.0 Fast Ethernet */
+#define	USB_PRODUCT_NETGEAR_M7100	0x1100		/* M7100 */
 #define	USB_PRODUCT_NETGEAR_MA111NA	0x4110		/* 802.11b */
 #define	USB_PRODUCT_NETGEAR_MA111V2	0x4230		/* 802.11b V2 */
 #define	USB_PRODUCT_NETGEAR_WG111V2_2	0x4240		/* PrismGT USB 2.0 WLAN */
@@ -3210,6 +3244,9 @@
 #define	USB_PRODUCT_OQO_ETHER01PLUS	0x7720		/* model 01+ Ethernet */
 #define	USB_PRODUCT_OQO_ETHER01	0x8150		/* model 01 Ethernet */
 
+/* Oregon Scientific */
+#define	USB_PRODUCT_OREGONSCI_OWL_CM160	0xca05		/* OWL CM-160 */
+
 /* Ours Technology Inc. */
 #define	USB_PRODUCT_OTI_SOLID	0x6803		/* Solid state disk */
 #define	USB_PRODUCT_OTI_DKU5	0x6858		/* DKU-5 Serial */
@@ -3664,6 +3701,12 @@
 #define	USB_PRODUCT_SEALEVEL_2803_7	0X2873		/* SeaLINK+8 (2803) Port 7 */
 #define	USB_PRODUCT_SEALEVEL_2803_8	0X2883		/* SeaLINK+8 (2803) Port 8 */
 
+/* Schweitzer Engineering Laboratories */
+#define	USB_PRODUCT_SEL_C662	0x0001		/* C662 */
+
+/* Seluxit products */
+#define	USB_PRODUCT_SELUXIT_RF	0x0010		/* RF Dongle */
+
 /* Senao products */
 #define	USB_PRODUCT_SENAO_RT2870_3	0x0605		/* RT2870 */
 #define	USB_PRODUCT_SENAO_RT2870_4	0x0615		/* RT2870 */
@@ -3736,6 +3779,9 @@
 #define	USB_PRODUCT_SIEMENS3_X65	0x0003		/* X65 */
 #define	USB_PRODUCT_SIEMENS3_X75	0x0004		/* X75 */
 
+/* Siemens(4) products */
+#define	USB_PRODUCT_SIEMENS4_RUGGEDCOM	0x01ff		/* RUGGEDCOM */
+
 /* Sierra Wireless products */
 #define	USB_PRODUCT_SIERRA_EM5625	0x0017		/* EM5625 */
 #define	USB_PRODUCT_SIERRA_MC5720	0x0018		/* MC5720 */
@@ -3783,6 +3829,7 @@
 #define	USB_PRODUCT_SILICOM_GPE	0x0002		/* Psion Dacom Gold Port Ethernet */
 
 /* Silicon Labs products */
+#define	USB_PRODUCT_SILABS5_EM358X	0x0002		/* EM358x */
 #define	USB_PRODUCT_SILABS_VSTABI	0x0f91		/* VStabi Controller */
 #define	USB_PRODUCT_SILABS_ARKHAM_DS101_M	0x1101		/* Arkham DS101 Monitor */
 #define	USB_PRODUCT_SILABS_ARKHAM_DS101_A	0x1601		/* Arkham DS101 Adapter */
@@ -3790,7 +3837,9 @@
 #define	USB_PRODUCT_SILABS_POLOLU	0x803b		/* Pololu Serial */
 #define	USB_PRODUCT_SILABS_SB_PARAMOUNT_ME	0x8043		/* Software Bisque Paramount ME */
 #define	USB_PRODUCT_SILABS_CYGNAL_DEBUG	0x8044		/* Cygnal Debug Adapter */
+#define	USB_PRODUCT_SILABS_SB_PARAMOUNT_ME2	0x804e		/* Software Bisque Paramount ME */
 #define	USB_PRODUCT_SILABS_EDG1228	0x8053		/* EDG1228 */
+#define	USB_PRODUCT_SILABS_GSM2228	0x8054		/* Enfora GSM2228 */
 #define	USB_PRODUCT_SILABS_ARGUSISP	0x8066		/* Argussoft ISP */
 #define	USB_PRODUCT_SILABS_IMS_USB_RS422	0x806f		/* IMS USB-RS422 */
 #define	USB_PRODUCT_SILABS_CRUMB128	0x807a		/* Crumb128 */
@@ -3821,6 +3870,7 @@
 #define	USB_PRODUCT_SILABS_LIPOWSKY_HARP	0x8218		/* Lipowsky HARP-1 */
 #define	USB_PRODUCT_SILABS_C2_EDGE_MODEM	0x822b		/* Commander 2 EDGE(GSM) Modem */
 #define	USB_PRODUCT_SILABS_CYGNAL_GPS	0x826b		/* Cygnal Fasttrax GPS */
+#define	USB_PRODUCT_SILABS_PLUGDRIVE	0x8281		/* Nanotec Plug & Drive */
 #define	USB_PRODUCT_SILABS_TELEGESIS_ETRX2	0x8293		/* Telegesis ETRX2USB */
 #define	USB_PRODUCT_SILABS_PROCYON_AVS	0x82f9		/* Procyon AVS */
 #define	USB_PRODUCT_SILABS_MC35PU	0x8341		/* MC35pu */
@@ -3833,13 +3883,22 @@
 #define	USB_PRODUCT_SILABS_BALLUFF_RFID	0x8477		/* Balluff RFID reader */
 #define	USB_PRODUCT_SILABS_AC_SERV_IBUS	0x85ea		/* AC-Services IBUS */
 #define	USB_PRODUCT_SILABS_AC_SERV_CIS	0x85eb		/* AC-Services CIS-IBUS */
+#define	USB_PRODUCT_SILABS_PREON32	0x85f8		/* Virtenio Preon32 */
 #define	USB_PRODUCT_SILABS_AC_SERV_CAN	0x8664		/* AC-Services CAN */
 #define	USB_PRODUCT_SILABS_AC_SERV_OBD	0x8665		/* AC-Services OBD */
+#define	USB_PRODUCT_SILABS_EM357LR	0x8856		/* CEL EM357 LR */
+#define	USB_PRODUCT_SILABS_EM357	0x8857		/* CEL EM357 */
+#define	USB_PRODUCT_SILABS_MMB_ZIGBEE	0x88a4		/* MMB Networks ZigBee */
+#define	USB_PRODUCT_SILABS_PII_ZIGBEE	0x88a5		/* Planet Innovation Ingeni ZigBee */
+#define	USB_PRODUCT_SILABS_KETRA_N1	0x8946		/* Ketra N1 */
+#define	USB_PRODUCT_SILABS_CELDEVKIT	0x8977		/* CEL MeshWorks DevKit */
+#define	USB_PRODUCT_SILABS_KCF_PRN	0x8998		/* KCF Technologies PRN */
+#define	USB_PRODUCT_SILABS_HUBZ	0x8a2a		/* HubZ ZigBee/Z-Wave */
 #define	USB_PRODUCT_SILABS2_DCU11CLONE	0xaa26		/* DCU-11 clone */
 #define	USB_PRODUCT_SILABS_CP210X_1	0xea60		/* CP210x Serial */
 #define	USB_PRODUCT_SILABS_CP210X_2	0xea61		/* CP210x Serial */
 #define	USB_PRODUCT_SILABS3_GPRS_MODEM	0xea61		/* GPRS Modem */
-#define	USB_PRODUCT_SILABS4_100EU_MODEM	0xea61		/* GPRS Modem 100EU */
+#define	USB_PRODUCT_SILABS4_100EU_MODEM	0xea6a		/* GPRS Modem 100EU */
 #define	USB_PRODUCT_SILABS_CP210X_3	0xea70		/* CP210x Serial */
 #define	USB_PRODUCT_SILABS_INFINITY_MIC	0xea71		/* Infinity GPS-MIC-1 */
 #define	USB_PRODUCT_SILABS_CP2110	0xea80		/* CP2110 USB HID Serial */
@@ -4242,6 +4301,10 @@
 #define	USB_PRODUCT_VALIDITY_VFS5011	0x0011		/* VFS5011 Fingerprint Reader */
 #define	USB_PRODUCT_VALIDITY_VFS5471	0x003c		/* VFS471 Fingerprint Reader */
 
+/* Van Ooijen Technische Informatica products */
+#define	USB_PRODUCT_VOTI_SELETEK_1	0x09b0		/* Lunatico Seletek */
+#define	USB_PRODUCT_VOTI_SELETEK_2	0x09b1		/* Lunatico Seletek */
+
 /* Velleman products */
 #define	USB_PRODUCT_VELLEMAN_K8055	0x5500		/* K8055 USB Experiment interface board */
 
@@ -4310,6 +4373,9 @@
 /* WaveSense products */
 #define	USB_PRODUCT_WAVESENSE_JAZZ	0xaaaa		/* Jazz blood glucose meter */
 
+/* West Mountain Radio products */
+#define	USB_PRODUCT_WMR_RIGBLASTER	0x0003		/* RIGblaster */
+
 /* WIENER Plein & Baus products */
 #define	USB_PRODUCT_WIENERPLEINBAUS_PL512	0x0010		/* PL512 PSU */
 #define	USB_PRODUCT_WIENERPLEINBAUS_RCM	0x0011		/* RCM Remote Control */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index b2bfafa2fc0..e76b245c11f 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.656 2015/05/12 11:15:42 stsp Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.657 2015/06/16 05:07:54 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.650 2015/05/12 11:14:06 stsp Exp 
+ *	OpenBSD: usbdevs,v 1.651 2015/06/16 05:07:25 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -2198,6 +2198,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "FEther USB-TXC",
 	},
 	{
+	    USB_VENDOR_CORSAIR, USB_PRODUCT_CORSAIR_CP210X,
+	    "CP210X",
+	},
+	{
 	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
 	    "Nomad II",
 	},
@@ -5318,6 +5322,82 @@ const struct usb_known_product usb_known_products[] = {
 	    "CD R/W",
 	},
 	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M121,
+	    "Model 121",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M218A,
+	    "Model 218A",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M219,
+	    "Model 219",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M233,
+	    "Model 233",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M235,
+	    "Model 235",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M335,
+	    "Model 335",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M336,
+	    "Model 336",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M350,
+	    "Model 350",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M371,
+	    "Model 371",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M411,
+	    "Model 411",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M425,
+	    "Model 425",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M455A,
+	    "Model 455A",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M475A,
+	    "Model 475A",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M465,
+	    "Model 465",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M625A,
+	    "Model 625A",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M642A,
+	    "Model 642A",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M648,
+	    "Model 648",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M737,
+	    "Model 737",
+	},
+	{
+	    USB_VENDOR_LAKESHORE, USB_PRODUCT_LAKESHORE_M776,
+	    "Model 776",
+	},
+	{
 	    USB_VENDOR_LARSENBRUSGAARD, USB_PRODUCT_LARSENBRUSGAARD_ALTITRACK,
 	    "AltiTrack",
 	},
@@ -7482,6 +7562,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB 2.0 Fast Ethernet",
 	},
 	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_M7100,
+	    "M7100",
+	},
+	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
 	    "802.11b",
 	},
@@ -7790,6 +7874,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "model 01 Ethernet",
 	},
 	{
+	    USB_VENDOR_OREGONSCI, USB_PRODUCT_OREGONSCI_OWL_CM160,
+	    "OWL CM-160",
+	},
+	{
 	    USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID,
 	    "Solid state disk",
 	},
@@ -9166,6 +9254,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "SeaLINK+8 (2803) Port 8",
 	},
 	{
+	    USB_VENDOR_SEL, USB_PRODUCT_SEL_C662,
+	    "C662",
+	},
+	{
+	    USB_VENDOR_SELUXIT, USB_PRODUCT_SELUXIT_RF,
+	    "RF Dongle",
+	},
+	{
 	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_3,
 	    "RT2870",
 	},
@@ -9374,6 +9470,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "X75",
 	},
 	{
+	    USB_VENDOR_SIEMENS4, USB_PRODUCT_SIEMENS4_RUGGEDCOM,
+	    "RUGGEDCOM",
+	},
+	{
 	    USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625,
 	    "EM5625",
 	},
@@ -9526,6 +9626,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Psion Dacom Gold Port Ethernet",
 	},
 	{
+	    USB_VENDOR_SILABS5, USB_PRODUCT_SILABS5_EM358X,
+	    "EM358x",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_VSTABI,
 	    "VStabi Controller",
 	},
@@ -9554,10 +9658,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Cygnal Debug Adapter",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SB_PARAMOUNT_ME2,
+	    "Software Bisque Paramount ME",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EDG1228,
 	    "EDG1228",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_GSM2228,
+	    "Enfora GSM2228",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP,
 	    "Argussoft ISP",
 	},
@@ -9678,6 +9790,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Cygnal Fasttrax GPS",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_PLUGDRIVE,
+	    "Nanotec Plug & Drive",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TELEGESIS_ETRX2,
 	    "Telegesis ETRX2USB",
 	},
@@ -9726,6 +9842,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "AC-Services CIS-IBUS",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_PREON32,
+	    "Virtenio Preon32",
+	},
+	{
 	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_AC_SERV_CAN,
 	    "AC-Services CAN",
 	},
@@ -9734,6 +9854,38 @@ const struct usb_known_product usb_known_products[] = {
 	    "AC-Services OBD",
 	},
 	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EM357LR,
+	    "CEL EM357 LR",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EM357,
+	    "CEL EM357",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_MMB_ZIGBEE,
+	    "MMB Networks ZigBee",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_PII_ZIGBEE,
+	    "Planet Innovation Ingeni ZigBee",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_KETRA_N1,
+	    "Ketra N1",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CELDEVKIT,
+	    "CEL MeshWorks DevKit",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_KCF_PRN,
+	    "KCF Technologies PRN",
+	},
+	{
+	    USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HUBZ,
+	    "HubZ ZigBee/Z-Wave",
+	},
+	{
 	    USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE,
 	    "DCU-11 clone",
 	},
@@ -10806,6 +10958,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "VFS471 Fingerprint Reader",
 	},
 	{
+	    USB_VENDOR_VOTI, USB_PRODUCT_VOTI_SELETEK_1,
+	    "Lunatico Seletek",
+	},
+	{
+	    USB_VENDOR_VOTI, USB_PRODUCT_VOTI_SELETEK_2,
+	    "Lunatico Seletek",
+	},
+	{
 	    USB_VENDOR_VELLEMAN, USB_PRODUCT_VELLEMAN_K8055,
 	    "K8055 USB Experiment interface board",
 	},
@@ -10966,6 +11126,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Jazz blood glucose meter",
 	},
 	{
+	    USB_VENDOR_WMR, USB_PRODUCT_WMR_RIGBLASTER,
+	    "RIGblaster",
+	},
+	{
 	    USB_VENDOR_WIENERPLEINBAUS, USB_PRODUCT_WIENERPLEINBAUS_PL512,
 	    "PL512 PSU",
 	},
@@ -12478,6 +12642,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "AuthenTec",
 	},
 	{
+	    USB_VENDOR_SIEMENS4,
+	    "Siemens",
+	},
+	{
 	    USB_VENDOR_AUDIOTECHNICA,
 	    "Audio-Technica",
 	},
@@ -12918,6 +13086,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Larsen and Brusgaard",
 	},
 	{
+	    USB_VENDOR_OREGONSCI,
+	    "Oregon Scientific",
+	},
+	{
 	    USB_VENDOR_UNKNOWN4,
 	    "Unknown Vendor",
 	},
@@ -12983,7 +13155,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	},
 	{
 	    USB_VENDOR_SILABS2,
-	    "SILABS2",
+	    "Silicon Labs",
 	},
 	{
 	    USB_VENDOR_USI,
@@ -13286,6 +13458,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Global Sun Technology",
 	},
 	{
+	    USB_VENDOR_VOTI,
+	    "Van Ooijen Technische Informatica",
+	},
+	{
 	    USB_VENDOR_ANYDATA,
 	    "AnyDATA Inc.",
 	},
@@ -13398,6 +13574,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "QinHeng Electronics",
 	},
 	{
+	    USB_VENDOR_SEL,
+	    "Schweitzer Engineering Laboratories",
+	},
+	{
+	    USB_VENDOR_SILABS5,
+	    "Silicon Labs",
+	},
+	{
+	    USB_VENDOR_CORSAIR,
+	    "Corsair",
+	},
+	{
 	    USB_VENDOR_MATRIXORB,
 	    "Matrix Orbital",
 	},
@@ -13450,6 +13638,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Pegatron",
 	},
 	{
+	    USB_VENDOR_SELUXIT,
+	    "Seluxit",
+	},
+	{
 	    USB_VENDOR_METAGEEK,
 	    "MetaGeek",
 	},
@@ -13470,6 +13662,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Vertex Wireless Co., Ltd.",
 	},
 	{
+	    USB_VENDOR_LAKESHORE,
+	    "Lake Shore",
+	},
+	{
 	    USB_VENDOR_DLINK,
 	    "D-Link",
 	},
@@ -13514,6 +13710,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "TP-Link",
 	},
 	{
+	    USB_VENDOR_WMR,
+	    "West Mountain Radio",
+	},
+	{
 	    USB_VENDOR_TRIPPLITE,
 	    "Tripp-Lite",
 	},