Skip to content

Commit a29c0ad

Browse files
committed
Merge tag 'usb-serial-5.9-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for 5.9-rc5 Here are some new device ids for 5.9. All have been in linux-next with no reported issues. * tag 'usb-serial-5.9-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: option: support dynamic Quectel USB compositions USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter
2 parents 7c6bbdf + 2bb70f0 commit a29c0ad

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

drivers/usb/serial/ftdi_sio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ static const struct usb_device_id id_table_combined[] = {
713713
{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
714714
{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
715715
{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },
716+
{ USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) },
716717
{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
717718
{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
718719
{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
#define XSENS_AWINDA_DONGLE_PID 0x0102
161161
#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
162162
#define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */
163+
#define XSENS_MTIUSBCONVERTER_PID 0x0301 /* MTi USB converter */
163164
#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
164165

165166
/* Xsens devices using FTDI VID */

drivers/usb/serial/option.c

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,14 +1094,18 @@ static const struct usb_device_id option_ids[] = {
10941094
{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),
10951095
.driver_info = RSVD(1) | RSVD(3) },
10961096
/* Quectel products using Quectel vendor ID */
1097-
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),
1098-
.driver_info = RSVD(4) },
1099-
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
1100-
.driver_info = RSVD(4) },
1101-
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95),
1102-
.driver_info = RSVD(4) },
1103-
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
1104-
.driver_info = RSVD(4) },
1097+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),
1098+
.driver_info = NUMEP2 },
1099+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0, 0) },
1100+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0xff, 0xff),
1101+
.driver_info = NUMEP2 },
1102+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0, 0) },
1103+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),
1104+
.driver_info = NUMEP2 },
1105+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
1106+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0xff, 0xff),
1107+
.driver_info = NUMEP2 },
1108+
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0, 0) },
11051109
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
11061110
.driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
11071111
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
@@ -1819,6 +1823,8 @@ static const struct usb_device_id option_ids[] = {
18191823
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */
18201824
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff), /* Simcom SIM7500/SIM7600 RNDIS mode */
18211825
.driver_info = RSVD(7) },
1826+
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */
1827+
{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */
18221828
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
18231829
.driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
18241830
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),

0 commit comments

Comments
 (0)