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

Merge tag 'usb-serial-5.3-rc1' of... 

Merge tag 'usb-serial-5.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial updates for 5.3-rc1

Here are the USB-serial updates for 5.3-rc1; just some new device ids
this time.

All have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: add ID for isodebug v1
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
parents aa9083fa f8377eff

drivers/usb/serial/ftdi_sio.c

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

	/* EZPrototypes devices */

	{ USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) },

	{ USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) },

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -1543,3 +1543,9 @@ 
#define CHETCO_SEASMART_DISPLAY_PID	0xA5AD /* SeaSmart NMEA2000 Display */

#define CHETCO_SEASMART_LITE_PID	0xA5AE /* SeaSmart Lite USB Adapter */

#define CHETCO_SEASMART_ANALOG_PID	0xA5AF /* SeaSmart Analog Adapter */



/*

 * Unjo AB

 */

#define UNJO_VID			0x22B7

#define UNJO_ISODEBUG_V1_PID		0x150D

drivers/usb/serial/option.c

+1 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,7 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0601, 0xff) },	/* GosunCn ZTE WeLink ME3630 (RNDIS mode) */

	{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0602, 0xff) },	/* GosunCn ZTE WeLink ME3630 (MBIM mode) */

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(4) },

CRA Git | Maintained and supported by SUSTech CRA and CCSE