aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2009-12-01 09:53:42 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 14:55:28 -0500
commita8cbd90a0410096e152f68a4e114a8b5c7abb49b (patch)
tree1bebb7cf75c24ee93c1a5d95c66329ea422bf577
parent8b4959d6a53b783b9f1cf1d5d9ed9f2c36440892 (diff)
USB: ftdi_sio: add USB device ID's for B&B Electronics line
Reviewed-by: John Pilles <jpilles@bb-elec.com> Signed-off-by: Cliff Brake <cbrake@bec-systems.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/ftdi_sio.c14
-rw-r--r--drivers/usb/serial/ftdi_sio.h14
2 files changed, 28 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index a8103e0347ee..f99498fca99a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -598,6 +598,20 @@ static struct usb_device_id id_table_combined [] = {
598 { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) }, 598 { USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
599 { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) }, 599 { USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
600 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) }, 600 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },
601 { USB_DEVICE(BANDB_VID, BANDB_USOPTL4_PID) },
602 { USB_DEVICE(BANDB_VID, BANDB_USPTL4_PID) },
603 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2DR_2_PID) },
604 { USB_DEVICE(BANDB_VID, BANDB_USO9ML2DR_PID) },
605 { USB_DEVICE(BANDB_VID, BANDB_USOPTL4DR2_PID) },
606 { USB_DEVICE(BANDB_VID, BANDB_USOPTL4DR_PID) },
607 { USB_DEVICE(BANDB_VID, BANDB_485USB9F_2W_PID) },
608 { USB_DEVICE(BANDB_VID, BANDB_485USB9F_4W_PID) },
609 { USB_DEVICE(BANDB_VID, BANDB_232USB9M_PID) },
610 { USB_DEVICE(BANDB_VID, BANDB_485USBTB_2W_PID) },
611 { USB_DEVICE(BANDB_VID, BANDB_485USBTB_4W_PID) },
612 { USB_DEVICE(BANDB_VID, BANDB_TTL5USB9M_PID) },
613 { USB_DEVICE(BANDB_VID, BANDB_TTL3USB9M_PID) },
614 { USB_DEVICE(BANDB_VID, BANDB_ZZ_PROG1_USB_PID) },
601 { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) }, 615 { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) },
602 { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) }, 616 { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) },
603 { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) }, 617 { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 6f31e0d71898..4586a24fafb0 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -662,6 +662,20 @@
662#define BANDB_USOTL4_PID 0xAC01 /* USOTL4 Isolated RS-485 Converter */ 662#define BANDB_USOTL4_PID 0xAC01 /* USOTL4 Isolated RS-485 Converter */
663#define BANDB_USTL4_PID 0xAC02 /* USTL4 RS-485 Converter */ 663#define BANDB_USTL4_PID 0xAC02 /* USTL4 RS-485 Converter */
664#define BANDB_USO9ML2_PID 0xAC03 /* USO9ML2 Isolated RS-232 Converter */ 664#define BANDB_USO9ML2_PID 0xAC03 /* USO9ML2 Isolated RS-232 Converter */
665#define BANDB_USOPTL4_PID 0xAC11
666#define BANDB_USPTL4_PID 0xAC12
667#define BANDB_USO9ML2DR_2_PID 0xAC16
668#define BANDB_USO9ML2DR_PID 0xAC17
669#define BANDB_USOPTL4DR2_PID 0xAC18 /* USOPTL4R-2 2-port Isolated RS-232 Converter */
670#define BANDB_USOPTL4DR_PID 0xAC19
671#define BANDB_485USB9F_2W_PID 0xAC25
672#define BANDB_485USB9F_4W_PID 0xAC26
673#define BANDB_232USB9M_PID 0xAC27
674#define BANDB_485USBTB_2W_PID 0xAC33
675#define BANDB_485USBTB_4W_PID 0xAC34
676#define BANDB_TTL5USB9M_PID 0xAC49
677#define BANDB_TTL3USB9M_PID 0xAC50
678#define BANDB_ZZ_PROG1_USB_PID 0xBA02
665 679
666/* 680/*
667 * RM Michaelides CANview USB (http://www.rmcan.com) 681 * RM Michaelides CANview USB (http://www.rmcan.com)