Skip to content

Commit 6a4c8f6

Browse files
committed
Merge tag 'usb-serial-5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for 5.13-rc3 Here are some new device ids for various drivers. All have been in linux-next with no reported issues. * tag 'usb-serial-5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: pl2303: add device id for ADLINK ND-6530 GC USB: serial: ti_usb_3410_5052: add startech.com device id USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011 USB: serial: ftdi_sio: add IDs for IDS GmbH Products
2 parents 10505b7 + f8e8c1b commit 6a4c8f6

File tree

6 files changed

+19
-0
lines changed

6 files changed

+19
-0
lines changed

drivers/usb/serial/ftdi_sio.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,6 +1034,9 @@ static const struct usb_device_id id_table_combined[] = {
10341034
/* Sienna devices */
10351035
{ USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },
10361036
{ 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) },
10371040
/* U-Blox devices */
10381041
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
10391042
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,13 @@
15671567
#define UNJO_VID 0x22B7
15681568
#define UNJO_ISODEBUG_V1_PID 0x150D
15691569

1570+
/*
1571+
* IDS GmbH
1572+
*/
1573+
#define IDS_VID 0x2CAF
1574+
#define IDS_SI31A_PID 0x13A2
1575+
#define IDS_CM31A_PID 0x13A3
1576+
15701577
/*
15711578
* U-Blox products (http://www.u-blox.com).
15721579
*/

drivers/usb/serial/option.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,6 +1240,10 @@ static const struct usb_device_id option_ids[] = {
12401240
.driver_info = NCTRL(0) | RSVD(1) },
12411241
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
12421242
.driver_info = NCTRL(0) },
1243+
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff), /* Telit LE910-S1 (RNDIS) */
1244+
.driver_info = NCTRL(2) },
1245+
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff), /* Telit LE910-S1 (ECM) */
1246+
.driver_info = NCTRL(2) },
12431247
{ USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */
12441248
.driver_info = NCTRL(0) | ZLP },
12451249
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */

drivers/usb/serial/pl2303.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ static const struct usb_device_id id_table[] = {
113113
{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
114114
{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
115115
{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
116+
{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },
116117
{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
117118
{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },
118119
{ } /* Terminating entry */

drivers/usb/serial/pl2303.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */
159159
#define ADLINK_VENDOR_ID 0x0b63
160160
#define ADLINK_ND6530_PRODUCT_ID 0x6530
161+
#define ADLINK_ND6530GC_PRODUCT_ID 0x653a
161162

162163
/* SMART USB Serial Adapter */
163164
#define SMART_VENDOR_ID 0x0b8c

drivers/usb/serial/ti_usb_3410_5052.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
/* Vendor and product ids */
3838
#define TI_VENDOR_ID 0x0451
3939
#define IBM_VENDOR_ID 0x04b3
40+
#define STARTECH_VENDOR_ID 0x14b0
4041
#define TI_3410_PRODUCT_ID 0x3410
4142
#define IBM_4543_PRODUCT_ID 0x4543
4243
#define IBM_454B_PRODUCT_ID 0x454b
@@ -370,6 +371,7 @@ static const struct usb_device_id ti_id_table_3410[] = {
370371
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) },
371372
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) },
372373
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) },
374+
{ USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) },
373375
{ } /* terminator */
374376
};
375377

@@ -408,6 +410,7 @@ static const struct usb_device_id ti_id_table_combined[] = {
408410
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) },
409411
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) },
410412
{ USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) },
413+
{ USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) },
411414
{ } /* terminator */
412415
};
413416

0 commit comments

Comments
 (0)