tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Greg Kroah-Hartman a29c0adb 7c6bbdf0

options
unified split
Changed files
+16 -8
drivers
usb
serial
ftdi_sio.c
ftdi_sio_ids.h
option.c
+1
drivers/usb/serial/ftdi_sio.c
··· 713 713 { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) }, 714 714 { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) }, 715 715 { USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) }, 716 + { USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) }, 716 717 { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) }, 717 718 { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, 718 719 { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
+1
drivers/usb/serial/ftdi_sio_ids.h
··· 160 160 #define XSENS_AWINDA_DONGLE_PID 0x0102 161 161 #define XSENS_MTW_PID 0x0200 /* Xsens MTw */ 162 162 #define XSENS_MTDEVBOARD_PID 0x0300 /* Motion Tracker Development Board */ 163 + #define XSENS_MTIUSBCONVERTER_PID 0x0301 /* MTi USB converter */ 163 164 #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */ 164 165 165 166 /* Xsens devices using FTDI VID */
+14 -8
drivers/usb/serial/option.c
··· 1094 1094 { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M), 1095 1095 .driver_info = RSVD(1) | RSVD(3) }, 1096 1096 /* 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) }, 1105 1109 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), 1106 1110 .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, 1107 1111 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) }, ··· 1823 1819 { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */ 1824 1820 { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff), /* Simcom SIM7500/SIM7600 RNDIS mode */ 1825 1821 .driver_info = RSVD(7) }, 1822 + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */ 1823 + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */ 1826 1824 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), 1827 1825 .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) }, 1828 1826 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),