Skip to content

Commit 226e2d2

Browse files
gregkhgregkh
committed
Merge tag 'usb-serial-4.18-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.18-rc3 Here are bunch of new device ids for cp210x. All have been in linux-next with no reported issues. Signed-off-by: Johan Hovold <johan@kernel.org>
2 parents 90f26cc + 2416062 commit 226e2d2

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

‎drivers/usb/serial/cp210x.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ static const struct usb_device_id id_table[] = {
9595
{ USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */
9696
{ USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
9797
{ USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
98+
{ USB_DEVICE(0x10C4, 0x817C) }, /* CESINEL MEDCAL N Power Quality Monitor */
99+
{ USB_DEVICE(0x10C4, 0x817D) }, /* CESINEL MEDCAL NT Power Quality Monitor */
100+
{ USB_DEVICE(0x10C4, 0x817E) }, /* CESINEL MEDCAL S Power Quality Monitor */
98101
{ USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
99102
{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
100103
{ USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
@@ -112,6 +115,9 @@ static const struct usb_device_id id_table[] = {
112115
{ USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */
113116
{ USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */
114117
{ USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */
118+
{ USB_DEVICE(0x10C4, 0x82EF) }, /* CESINEL FALCO 6105 AC Power Supply */
119+
{ USB_DEVICE(0x10C4, 0x82F1) }, /* CESINEL MEDCAL EFD Earth Fault Detector */
120+
{ USB_DEVICE(0x10C4, 0x82F2) }, /* CESINEL MEDCAL ST Network Analyzer */
115121
{ USB_DEVICE(0x10C4, 0x82F4) }, /* Starizona MicroTouch */
116122
{ USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */
117123
{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
@@ -124,7 +130,9 @@ static const struct usb_device_id id_table[] = {
124130
{ USB_DEVICE(0x10C4, 0x8470) }, /* Juniper Networks BX Series System Console */
125131
{ USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
126132
{ USB_DEVICE(0x10C4, 0x84B6) }, /* Starizona Hyperion */
133+
{ USB_DEVICE(0x10C4, 0x851E) }, /* CESINEL MEDCAL PT Network Analyzer */
127134
{ USB_DEVICE(0x10C4, 0x85A7) }, /* LifeScan OneTouch Verio IQ */
135+
{ USB_DEVICE(0x10C4, 0x85B8) }, /* CESINEL ReCon T Energy Logger */
128136
{ USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */
129137
{ USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */
130138
{ USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */
@@ -134,17 +142,23 @@ static const struct usb_device_id id_table[] = {
134142
{ USB_DEVICE(0x10C4, 0x8857) }, /* CEL EM357 ZigBee USB Stick */
135143
{ USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
136144
{ USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
145+
{ USB_DEVICE(0x10C4, 0x88FB) }, /* CESINEL MEDCAL STII Network Analyzer */
146+
{ USB_DEVICE(0x10C4, 0x8938) }, /* CESINEL MEDCAL S II Network Analyzer */
137147
{ USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
138148
{ USB_DEVICE(0x10C4, 0x8962) }, /* Brim Brothers charging dock */
139149
{ USB_DEVICE(0x10C4, 0x8977) }, /* CEL MeshWorks DevKit Device */
140150
{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
151+
{ USB_DEVICE(0x10C4, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */
141152
{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
142153
{ USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
143154
{ USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
144155
{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
145156
{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
157+
{ USB_DEVICE(0x10C4, 0xEA63) }, /* Silicon Labs Windows Update (CP2101-4/CP2102N) */
146158
{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
147159
{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
160+
{ USB_DEVICE(0x10C4, 0xEA7A) }, /* Silicon Labs Windows Update (CP2105) */
161+
{ USB_DEVICE(0x10C4, 0xEA7B) }, /* Silicon Labs Windows Update (CP2108) */
148162
{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
149163
{ USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
150164
{ USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */

0 commit comments

Comments
 (0)