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

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

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

Johan writes:

USB-serial fixes for 5.8-rc5

Here are some new device ids for 5.8.

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

* tag 'usb-serial-5.8-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Quectel EG95 LTE modem
  USB: serial: ch341: add new Product ID for CH340
  USB: serial: option: add GosunCn GM500 series
  USB: serial: cypress_m8: enable Simply Automated UPB PIM
parents 876d4e1e da6902e5

drivers/usb/serial/ch341.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 


static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x4348, 0x5523) },

	{ USB_DEVICE(0x1a86, 0x7522) },

	{ USB_DEVICE(0x1a86, 0x7523) },

	{ USB_DEVICE(0x1a86, 0x5523) },

	{ },

drivers/usb/serial/cypress_m8.c

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static const struct usb_device_id id_table_earthmate[] = { 


static const struct usb_device_id id_table_cyphidcomrs232[] = {

	{ USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_SAI, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },

	{ USB_DEVICE(VENDOR_ID_FRWD, PRODUCT_ID_CYPHIDCOM_FRWD) },

	{ }						/* Terminating entry */
@@ -73,6 +74,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB) },

	{ USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB_LT20) },

	{ USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_SAI, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },

	{ USB_DEVICE(VENDOR_ID_FRWD, PRODUCT_ID_CYPHIDCOM_FRWD) },

	{ USB_DEVICE(VENDOR_ID_DAZZLE, PRODUCT_ID_CA42) },

drivers/usb/serial/cypress_m8.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
#define VENDOR_ID_CYPRESS		0x04b4

#define PRODUCT_ID_CYPHIDCOM		0x5500



/* Simply Automated HID->COM UPB PIM (using Cypress PID 0x5500) */

#define VENDOR_ID_SAI			0x17dd



/* FRWD Dongle - a GPS sports watch */

#define VENDOR_ID_FRWD			0x6737

#define PRODUCT_ID_CYPHIDCOM_FRWD	0x0001

drivers/usb/serial/option.c

+6 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ static void option_instat_callback(struct urb *urb); 
/* These Quectel products use Quectel's vendor ID */

#define QUECTEL_PRODUCT_EC21			0x0121

#define QUECTEL_PRODUCT_EC25			0x0125

#define QUECTEL_PRODUCT_EG95			0x0195

#define QUECTEL_PRODUCT_BG96			0x0296

#define QUECTEL_PRODUCT_EP06			0x0306

#define QUECTEL_PRODUCT_EM12			0x0512
@@ -1097,6 +1098,8 @@ static const struct usb_device_id option_ids[] = { 
	  .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_EP06, 0xff, 0xff, 0xff),
@@ -2028,6 +2031,9 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) | RSVD(5) },

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

	  .driver_info = RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) },			/* GosunCn GM500 RNDIS */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) },			/* GosunCn GM500 MBIM */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE