aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-25 06:18:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-25 06:18:11 -0400
commit5caf6ae5ce880ec15448b310e47a9515ebb7e808 (patch)
treef55c60b0b7e17cddfaf174bcade7a3cf3a902ff9 /drivers/usb/serial
parent638139eb95d2d241781330a321e88c8dafe46078 (diff)
parentdee80ad12d2b1b304286a707fde7ab05d1fc7bab (diff)
Merge tag 'usb-serial-3.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial fixes for v3.17 Here are two more device IDs for v3.17. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/cp210x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index e4bb62225cb9..eca1747ca8c7 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -122,6 +122,7 @@ static const struct usb_device_id id_table[] = {
122 { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ 122 { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */
123 { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ 123 { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
124 { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ 124 { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
125 { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
125 { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ 126 { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
126 { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ 127 { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
127 { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */ 128 { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
@@ -155,6 +156,7 @@ static const struct usb_device_id id_table[] = {
155 { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ 156 { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
156 { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ 157 { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */
157 { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ 158 { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
159 { USB_DEVICE(0x1D6F, 0x0010) }, /* Seluxit ApS RF Dongle */
158 { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ 160 { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
159 { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */ 161 { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
160 { USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */ 162 { USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */