Commit a29c0adb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.9-rc5' of... 

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
parents 7c6bbdf0 2bb70f0a

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_MTIUSBCONVERTER_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#define XSENS_AWINDA_DONGLE_PID 0x0102

#define XSENS_MTW_PID		0x0200	/* Xsens MTw */

#define XSENS_MTDEVBOARD_PID	0x0300	/* Motion Tracker Development Board */

#define XSENS_MTIUSBCONVERTER_PID	0x0301	/* MTi USB converter */

#define XSENS_CONVERTER_PID	0xD00D	/* Xsens USB-serial converter */



/* Xsens devices using FTDI VID */

drivers/usb/serial/option.c

+14 −8
Original line number Diff line number Diff line
@@ -1094,14 +1094,18 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),

	  .driver_info = RSVD(1) | RSVD(3) },

	/* Quectel products using Quectel vendor ID */

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },

	{ 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[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) },	/* Simcom SIM7500/SIM7600 MBIM mode */

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff),	/* Simcom SIM7500/SIM7600 RNDIS mode */

	  .driver_info = RSVD(7) },

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */

	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */

	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),

	  .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },

	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),

CRA Git | Maintained and supported by SUSTech CRA and CCSE