diff options
author | Craig Shelley <craig@microtron.org.uk> | 2010-05-15 08:36:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:48 -0400 |
commit | eefd9029fde4d90d59804eeb54880ab8db5c1866 (patch) | |
tree | 1900d0a5ae2046eabc57bafe85fc0b65a1cd8c33 /drivers | |
parent | 9a1f298f8bc92f21b09bd7ef396c2fc6544ce9aa (diff) |
USB: CP210x New Device IDs 11 New device IDs
Signed-off-by: Craig Shelley <craig@microtron.org.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index ca27f2f8522d..8b8c7976b4c0 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -59,6 +59,8 @@ static const struct usb_device_id id_table[] = { | |||
59 | { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ | 59 | { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ |
60 | { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ | 60 | { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ |
61 | { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ | 61 | { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ |
62 | { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ | ||
63 | { USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */ | ||
62 | { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ | 64 | { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ |
63 | { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ | 65 | { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ |
64 | { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */ | 66 | { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */ |
@@ -70,9 +72,12 @@ static const struct usb_device_id id_table[] = { | |||
70 | { USB_DEVICE(0x10C4, 0x1601) }, /* Arkham Technology DS101 Adapter */ | 72 | { USB_DEVICE(0x10C4, 0x1601) }, /* Arkham Technology DS101 Adapter */ |
71 | { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ | 73 | { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ |
72 | { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ | 74 | { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ |
75 | { USB_DEVICE(0x10C4, 0x8044) }, /* Cygnal Debug Adapter */ | ||
76 | { USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */ | ||
73 | { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ | 77 | { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ |
74 | { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ | 78 | { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ |
75 | { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ | 79 | { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ |
80 | { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */ | ||
76 | { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ | 81 | { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ |
77 | { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ | 82 | { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ |
78 | { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */ | 83 | { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */ |
@@ -80,12 +85,15 @@ static const struct usb_device_id id_table[] = { | |||
80 | { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */ | 85 | { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */ |
81 | { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */ | 86 | { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */ |
82 | { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */ | 87 | { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */ |
88 | { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */ | ||
83 | { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ | 89 | { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ |
84 | { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ | 90 | { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ |
85 | { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ | 91 | { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ |
92 | { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ | ||
86 | { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ | 93 | { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ |
87 | { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ | 94 | { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ |
88 | { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ | 95 | { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ |
96 | { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ | ||
89 | { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ | 97 | { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ |
90 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ | 98 | { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ |
91 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ | 99 | { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ |
@@ -103,6 +111,7 @@ static const struct usb_device_id id_table[] = { | |||
103 | { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ | 111 | { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ |
104 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ | 112 | { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ |
105 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ | 113 | { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ |
114 | { USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */ | ||
106 | { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ | 115 | { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ |
107 | { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */ | 116 | { USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */ |
108 | { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */ | 117 | { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */ |
@@ -113,6 +122,8 @@ static const struct usb_device_id id_table[] = { | |||
113 | { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ | 122 | { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ |
114 | { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ | 123 | { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ |
115 | { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ | 124 | { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ |
125 | { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */ | ||
126 | { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ | ||
116 | { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ | 127 | { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ |
117 | { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ | 128 | { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ |
118 | { } /* Terminating Entry */ | 129 | { } /* Terminating Entry */ |