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

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

Johan writes:

USB-serial fixes for 5.18-rc7

Here are some new device ids.

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

* tag 'usb-serial-5.18-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: qcserial: add support for Sierra Wireless EM7590
  USB: serial: option: add Fibocom MA510 modem
  USB: serial: option: add Fibocom L610 modem
  USB: serial: pl2303: add device id for HP LM930 Display
parents 1645eee0 870b1eee

drivers/usb/serial/option.c

+4 −0
Original line number Diff line number Diff line
@@ -2123,10 +2123,14 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(3) },

	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 (IOT version) */

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

	{ USB_DEVICE(0x1782, 0x4d10) },						/* Fibocom L610 (AT mode) */

	{ USB_DEVICE_INTERFACE_CLASS(0x1782, 0x4d11, 0xff) },			/* Fibocom L610 (ECM/RNDIS mode) */

	{ USB_DEVICE(0x2cb7, 0x0104),						/* Fibocom NL678 series */

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

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff),			/* Fibocom NL678 series */

	  .driver_info = RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0106, 0xff) },			/* Fibocom MA510 (ECM mode w/ diag intf.) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) },			/* Fibocom MA510 (ECM mode) */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) },	/* Fibocom FG150 Diag */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) },		/* Fibocom FG150 AT */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */

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(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LM920_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LM930_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_LM940_PRODUCT_ID) },

	{ USB_DEVICE(HP_VENDOR_ID, HP_TD620_PRODUCT_ID) },

	{ USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },

drivers/usb/serial/pl2303.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define HP_TD620_PRODUCT_ID	0x0956

#define HP_LD960_PRODUCT_ID	0x0b39

#define HP_LD381_PRODUCT_ID	0x0f7f

#define HP_LM930_PRODUCT_ID	0x0f9b

#define HP_LCM220_PRODUCT_ID	0x3139

#define HP_LCM960_PRODUCT_ID	0x3239

#define HP_LD220_PRODUCT_ID	0x3524

drivers/usb/serial/qcserial.c

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x1199, 0x9090)},	/* Sierra Wireless EM7565 QDL */

	{DEVICE_SWI(0x1199, 0x9091)},	/* Sierra Wireless EM7565 */

	{DEVICE_SWI(0x1199, 0x90d2)},	/* Sierra Wireless EM9191 QDL */

	{DEVICE_SWI(0x1199, 0xc080)},	/* Sierra Wireless EM7590 QDL */

	{DEVICE_SWI(0x1199, 0xc081)},	/* Sierra Wireless EM7590 */

	{DEVICE_SWI(0x413c, 0x81a2)},	/* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81a3)},	/* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81a4)},	/* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */