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

Merge tag 'usb-serial-5.16-rc6' of... 

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

Johan writes:

USB-serial fixes for 5.16-rc6

Here's a fix for a reported problem in the cp210x gpio-registration code
and some more modem device ids.

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

* tag 'usb-serial-5.16-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Telit FN990 compositions
  USB: serial: cp210x: fix CP2105 GPIO registration
parents ca4d8344 2b503c85

drivers/usb/serial/cp210x.c

+4 −2
Original line number Diff line number Diff line
@@ -1635,6 +1635,8 @@ static int cp2105_gpioconf_init(struct usb_serial *serial) 


	/*  2 banks of GPIO - One for the pins taken from each serial port */

	if (intf_num == 0) {

		priv->gc.ngpio = 2;



		if (mode.eci == CP210X_PIN_MODE_MODEM) {

			/* mark all GPIOs of this interface as reserved */

			priv->gpio_altfunc = 0xff;
@@ -1645,8 +1647,9 @@ static int cp2105_gpioconf_init(struct usb_serial *serial) 
		priv->gpio_pushpull = (u8)((le16_to_cpu(config.gpio_mode) &

						CP210X_ECI_GPIO_MODE_MASK) >>

						CP210X_ECI_GPIO_MODE_OFFSET);

		priv->gc.ngpio = 2;

	} else if (intf_num == 1) {

		priv->gc.ngpio = 3;



		if (mode.sci == CP210X_PIN_MODE_MODEM) {

			/* mark all GPIOs of this interface as reserved */

			priv->gpio_altfunc = 0xff;
@@ -1657,7 +1660,6 @@ static int cp2105_gpioconf_init(struct usb_serial *serial) 
		priv->gpio_pushpull = (u8)((le16_to_cpu(config.gpio_mode) &

						CP210X_SCI_GPIO_MODE_MASK) >>

						CP210X_SCI_GPIO_MODE_OFFSET);

		priv->gc.ngpio = 3;

	} else {

		return -ENODEV;

	}

drivers/usb/serial/option.c

+8 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,14 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(2) | RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1063, 0xff),	/* Telit LN920 (ECM) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1070, 0xff),	/* Telit FN990 (rmnet) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1071, 0xff),	/* Telit FN990 (MBIM) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1072, 0xff),	/* Telit FN990 (RNDIS) */

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

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1073, 0xff),	/* Telit FN990 (ECM) */

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

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),

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

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),