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

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

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

Johan writes:

USB-serial fixes for 5.14-rc3

Here are some new device ids and a device-id comment fix.

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

* tag 'usb-serial-5.14-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
  USB: serial: cp210x: fix comments for GE CS1000
  USB: serial: option: add support for u-blox LARA-R6 family
parents f3a1a937 d6a206e6

drivers/usb/serial/cp210x.c

+3 −2
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */

	{ USB_DEVICE(0x10C4, 0x89FB) }, /* Qivicon ZigBee USB Radio Stick */

	{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */

	{ USB_DEVICE(0x10C4, 0x8A5B) }, /* CEL EM3588 ZigBee USB Stick */

	{ USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */

	{ USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */

	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
@@ -202,8 +203,8 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x1901, 0x0194) },	/* GE Healthcare Remote Alarm Box */

	{ USB_DEVICE(0x1901, 0x0195) },	/* GE B850/B650/B450 CP2104 DP UART interface */

	{ USB_DEVICE(0x1901, 0x0196) },	/* GE B850 CP2105 DP UART interface */

	{ USB_DEVICE(0x1901, 0x0197) }, /* GE CS1000 Display serial interface */

	{ USB_DEVICE(0x1901, 0x0198) }, /* GE CS1000 M.2 Key E serial interface */

	{ USB_DEVICE(0x1901, 0x0197) }, /* GE CS1000 M.2 Key E serial interface */

	{ USB_DEVICE(0x1901, 0x0198) }, /* GE CS1000 Display serial interface */

	{ USB_DEVICE(0x199B, 0xBA30) }, /* LORD WSDA-200-USB */

	{ USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */

	{ USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static void option_instat_callback(struct urb *urb); 
#define QUECTEL_PRODUCT_UC15			0x9090

/* These u-blox products use Qualcomm's vendor ID */

#define UBLOX_PRODUCT_R410M			0x90b2

#define UBLOX_PRODUCT_R6XX			0x90fa

/* These Yuga products use Qualcomm's vendor ID */

#define YUGA_PRODUCT_CLM920_NC5			0x9625
@@ -1101,6 +1102,8 @@ static const struct usb_device_id option_ids[] = { 
	/* u-blox products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),

	  .driver_info = RSVD(1) | RSVD(3) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX),

	  .driver_info = RSVD(3) },

	/* Quectel products using Quectel vendor ID */

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),

	  .driver_info = NUMEP2 },