Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28409de8 authored by Davide Tronchin's avatar Davide Tronchin Committed by Greg Kroah-Hartman
Browse files

USB: serial: option: add u-blox LARA-L6 modem 



commit c1547f12df8b8e9ca2686accee43213ecd117efe upstream.

Add LARA-L6 PIDs for three different USB compositions.

LARA-L6 module can be configured (by AT interface) in three different
USB modes:
* Default mode (Vendor ID: 0x1546 Product ID: 0x1341) with 4 serial
interfaces
* RmNet mode (Vendor ID: 0x1546 Product ID: 0x1342) with 4 serial
interfaces and 1 RmNet virtual network interface
* CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1343) with 4 serial
interface and 1 CDC-ECM virtual network interface

In default mode LARA-L6 exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions

In RmNet mode LARA-L6 exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parset/alternative functions
If 4: RMNET interface

In CDC-ECM mode LARA-L6 exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parset/alternative functions
If 4: CDC-ECM interface

Signed-off-by: default avatarDavide Tronchin <davide.tronchin.94@gmail.com>
[ johan: drop PID defines in favour of comments ]
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 528ac1b7

drivers/usb/serial/option.c

+8 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ static void option_instat_callback(struct urb *urb); 
#define NOVATELWIRELESS_PRODUCT_G2		0xA010

#define NOVATELWIRELESS_PRODUCT_MC551		0xB001



#define UBLOX_VENDOR_ID				0x1546



/* AMOI PRODUCTS */

#define AMOI_VENDOR_ID				0x1614

#define AMOI_PRODUCT_H01			0x0800
@@ -1130,6 +1132,12 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa),

	  .driver_info = RSVD(3) },

	/* u-blox products */

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) },	/* u-blox LARA-L6 */

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1342),		/* u-blox LARA-L6 (RMNET) */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1343),		/* u-blox LARA-L6 (ECM) */

	  .driver_info = RSVD(4) },

	/* Quectel products using Quectel vendor ID */

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

	  .driver_info = NUMEP2 },