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

Merge tag 'usb-serial-6.3-rc1' of... 

Merge tag 'usb-serial-6.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB-serial updates for 6.3-rc1

Here are the USB-serial updates for 6.3-rc1; just a new modem device
id this time.

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

* tag 'usb-serial-6.3-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add support for VW/Skoda "Carstick LTE"
parents e3eafcf0 617c331d

drivers/usb/serial/option.c

+4 −0
Original line number Diff line number Diff line
@@ -402,6 +402,8 @@ static void option_instat_callback(struct urb *urb); 
#define LONGCHEER_VENDOR_ID			0x1c9e



/* 4G Systems products */

/* This one was sold as the VW and Skoda "Carstick LTE" */

#define FOUR_G_SYSTEMS_PRODUCT_CARSTICK_LTE	0x7605

/* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *

 * It seems to contain a Qualcomm QSC6240/6290 chipset            */

#define FOUR_G_SYSTEMS_PRODUCT_W14		0x9603
@@ -1976,6 +1978,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(2) },

	{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },

	{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_CARSTICK_LTE),

	  .driver_info = RSVD(0) },

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),

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

	{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100),