On Tue, Mar 04, 2025 at 10:19:38AM +0100, Fabio Porcedda wrote:
> Add the following Telit Cinterion FE990B40 compositions:
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Fabio Porcedda <fabio.porcedda@xxxxxxxxx>
> ---
> drivers/usb/serial/option.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index 58bd54e8c483..8660f7a89b01 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -1388,6 +1388,22 @@ static const struct usb_device_id option_ids[] = {
> .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) },
> { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10aa, 0xff), /* Telit FN920C04 (MBIM) */
> .driver_info = NCTRL(3) | RSVD(4) | RSVD(5) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b0, 0x60) }, /* Telit FE990B (rmnet) */
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b0, 0x40) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b0, 0x30),
> + .driver_info = NCTRL(5) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b1, 0x60) }, /* Telit FE990B (MBIM) */
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b1, 0x40) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b1, 0x30),
> + .driver_info = NCTRL(6) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b2, 0x60) }, /* Telit FE990B (RNDIS) */
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b2, 0x40) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b2, 0x30),
> + .driver_info = NCTRL(6) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b3, 0x60) }, /* Telit FE990B (ECM) */
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b3, 0x40) },
> + { USB_DEVICE_INTERFACE_PROTOCOL(TELIT_VENDOR_ID, 0x10b3, 0x30),
> + .driver_info = NCTRL(6) },
Thanks for the patches. I noticed now that you use
USB_DEVICE_INTERFACE_PROTOCOL() just like you recently did for FN990B.
While this works, the protocol is qualified by the interface class and
subclass which should have been included.
I changed these to use USB_DEVICE_AND_INTERFACE_INFO() and sorted the
entries also by protocol.
I'll send out a corresponding change for FN990B.
Johan
