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

Merge tag 'usb-serial-5.13-rc3' of... 

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
parents 10505b72 f8e8c1b2

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,9 @@ static const struct usb_device_id id_table_combined[] = { 
	/* Sienna devices */

	{ USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },

	{ USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) },

	/* IDS GmbH devices */

	{ USB_DEVICE(IDS_VID, IDS_SI31A_PID) },

	{ USB_DEVICE(IDS_VID, IDS_CM31A_PID) },

	/* U-Blox devices */

	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },

	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -1567,6 +1567,13 @@ 
#define UNJO_VID			0x22B7

#define UNJO_ISODEBUG_V1_PID		0x150D



/*

 * IDS GmbH

 */

#define IDS_VID				0x2CAF

#define IDS_SI31A_PID			0x13A2

#define IDS_CM31A_PID			0x13A3



/*

 * U-Blox products (http://www.u-blox.com).

 */

drivers/usb/serial/option.c

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff),	/* Telit LN940 (MBIM) */

	  .driver_info = NCTRL(0) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff),	/* Telit LE910-S1 (RNDIS) */

	  .driver_info = NCTRL(2) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff),	/* Telit LE910-S1 (ECM) */

	  .driver_info = NCTRL(2) },

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x9010),				/* Telit SBL FN980 flashing device */

	  .driver_info = NCTRL(0) | ZLP },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */

drivers/usb/serial/pl2303.c

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },

	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },

	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },

	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },

	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },

	{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },

	{ }					/* Terminating entry */

drivers/usb/serial/pl2303.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ 
/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */

#define ADLINK_VENDOR_ID		0x0b63

#define ADLINK_ND6530_PRODUCT_ID	0x6530

#define ADLINK_ND6530GC_PRODUCT_ID	0x653a



/* SMART USB Serial Adapter */

#define SMART_VENDOR_ID	0x0b8c