Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for 5.2-rc5

Here are some new device ids for option and pl2303.

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

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

* tag 'usb-serial-5.2-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Telit 0x1260 and 0x1261 compositions
  USB: serial: pl2303: add Allied Telesis VT-Kit3
  USB: serial: option: add support for Simcom SIM7500/SIM7600 RNDIS mode
parents 01fb49ff f3dfd407

drivers/usb/serial/option.c

+6 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,10 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),

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

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1260),

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

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1261),

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

	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1900),				/* Telit LN940 (QMI) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff),	/* Telit LN940 (MBIM) */
@@ -1772,6 +1776,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E),

	  .driver_info = RSVD(5) | RSVD(6) },

	{ 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(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),

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

	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),

drivers/usb/serial/pl2303.c

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

	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_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

+3 −0
Original line number Diff line number Diff line
@@ -155,3 +155,6 @@ 
#define SMART_VENDOR_ID	0x0b8c

#define SMART_PRODUCT_ID	0x2303



/* Allied Telesis VT-Kit3 */

#define AT_VENDOR_ID		0x0caa

#define AT_VTKIT3_PRODUCT_ID	0x3001