diff options
author | Daniel Sangorrin <daniel.sangorrin@gmail.com> | 2010-02-21 21:03:11 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 12:06:58 -0400 |
commit | 6d73d95b3a0e3af7f962ca8e6925c49873d792fa (patch) | |
tree | eb5b9aba694367738052cd80f60016d5a7234f4e /drivers | |
parent | 8abdcf11e07333d3a0d37c6b77c7574d8dbb8dca (diff) |
USB: serial: ftdi: add CONTEC vendor and product id
commit 46b72d78cb022714c89a9ebc00b9581b550cfca7 upstream.
This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds
identifiers for CONTEC USB serial converter. I tested it
with the device COM-1(USB)H
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 53bec70848d8..34acf6c3645f 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -614,6 +614,7 @@ static struct usb_device_id id_table_combined [] = { | |||
614 | { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) }, | 614 | { USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) }, |
615 | { USB_DEVICE(TTI_VID, TTI_QL355P_PID) }, | 615 | { USB_DEVICE(TTI_VID, TTI_QL355P_PID) }, |
616 | { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) }, | 616 | { USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) }, |
617 | { USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) }, | ||
617 | { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, | 618 | { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, |
618 | { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, | 619 | { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, |
619 | { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, | 620 | { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index d1ead4ecdd3e..d10b5a882e7c 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -494,6 +494,13 @@ | |||
494 | #define RATOC_PRODUCT_ID_USB60F 0xb020 | 494 | #define RATOC_PRODUCT_ID_USB60F 0xb020 |
495 | 495 | ||
496 | /* | 496 | /* |
497 | * Contec products (http://www.contec.com) | ||
498 | * Submitted by Daniel Sangorrin | ||
499 | */ | ||
500 | #define CONTEC_VID 0x06CE /* Vendor ID */ | ||
501 | #define CONTEC_COM1USBH_PID 0x8311 /* COM-1(USB)H */ | ||
502 | |||
503 | /* | ||
497 | * Definitions for B&B Electronics products. | 504 | * Definitions for B&B Electronics products. |
498 | */ | 505 | */ |
499 | #define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ | 506 | #define BANDB_VID 0x0856 /* B&B Electronics Vendor ID */ |