aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8ed84338a626..4857e79d0744 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -214,6 +214,7 @@ static const struct usb_device_id id_table_combined[] = {
214 { USB_DEVICE(FTDI_VID, FTDI_MTXORB_6_PID) }, 214 { USB_DEVICE(FTDI_VID, FTDI_MTXORB_6_PID) },
215 { USB_DEVICE(FTDI_VID, FTDI_R2000KU_TRUE_RNG) }, 215 { USB_DEVICE(FTDI_VID, FTDI_R2000KU_TRUE_RNG) },
216 { USB_DEVICE(FTDI_VID, FTDI_VARDAAN_PID) }, 216 { USB_DEVICE(FTDI_VID, FTDI_VARDAAN_PID) },
217 { USB_DEVICE(FTDI_VID, FTDI_AUTO_M3_OP_COM_V2_PID) },
217 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0100_PID) }, 218 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0100_PID) },
218 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0101_PID) }, 219 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0101_PID) },
219 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0102_PID) }, 220 { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0102_PID) },
@@ -606,6 +607,7 @@ static const struct usb_device_id id_table_combined[] = {
606 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 607 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
607 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) }, 608 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },
608 { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) }, 609 { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },
610 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONMX_PID) },
609 { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, 611 { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
610 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) }, 612 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
611 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) }, 613 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
@@ -962,6 +964,7 @@ static const struct usb_device_id id_table_combined[] = {
962 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) }, 964 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
963 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) }, 965 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
964 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) }, 966 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
967 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_159_PID) },
965 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) }, 968 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
966 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) }, 969 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
967 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) }, 970 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
@@ -970,12 +973,14 @@ static const struct usb_device_id id_table_combined[] = {
970 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) }, 973 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
971 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) }, 974 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
972 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) }, 975 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
976 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_235_PID) },
973 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) }, 977 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
974 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) }, 978 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
975 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) }, 979 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
976 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) }, 980 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
977 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) }, 981 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
978 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) }, 982 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
983 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_320_PID) },
979 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) }, 984 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
980 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) }, 985 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
981 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) }, 986 { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },
@@ -1029,6 +1034,9 @@ static const struct usb_device_id id_table_combined[] = {
1029 /* Sienna devices */ 1034 /* Sienna devices */
1030 { USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) }, 1035 { USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },
1031 { USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) }, 1036 { USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) },
1037 /* IDS GmbH devices */
1038 { USB_DEVICE(IDS_VID, IDS_SI31A_PID) },
1039 { USB_DEVICE(IDS_VID, IDS_CM31A_PID) },
1032 /* U-Blox devices */ 1040 /* U-Blox devices */
1033 { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, 1041 { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
1034 { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) }, 1042 { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },