Commit 01d7956b authored by Daniele Palmas's avatar Daniele Palmas Committed by Johan Hovold
Browse files

USB: serial: option: add support for Telit LE920A4 



This patch adds a set of compositions for Telit LE920A4.

Compositions in short are:

0x1207: tty + tty
0x1208: tty + adb + tty + tty
0x1211: tty + adb + ecm
0x1212: tty + adb
0x1213: ecm + tty
0x1214: tty + adb + ecm + tty

telit_le922_blacklist_usbcfg3 is reused for compositions 0x1211
and 0x1214 due to the same interfaces positions.

Signed-off-by: default avatarDaniele Palmas <dnlplm@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent ae34d12c

drivers/usb/serial/option.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -274,6 +274,12 @@ static void option_instat_callback(struct urb *urb); 
#define TELIT_PRODUCT_LE920			0x1200

#define TELIT_PRODUCT_LE920			0x1200

#define TELIT_PRODUCT_LE910			0x1201

#define TELIT_PRODUCT_LE910			0x1201

#define TELIT_PRODUCT_LE910_USBCFG4		0x1206

#define TELIT_PRODUCT_LE910_USBCFG4		0x1206

#define TELIT_PRODUCT_LE920A4_1207		0x1207

#define TELIT_PRODUCT_LE920A4_1208		0x1208

#define TELIT_PRODUCT_LE920A4_1211		0x1211

#define TELIT_PRODUCT_LE920A4_1212		0x1212

#define TELIT_PRODUCT_LE920A4_1213		0x1213

#define TELIT_PRODUCT_LE920A4_1214		0x1214





/* ZTE PRODUCTS */

/* ZTE PRODUCTS */

#define ZTE_VENDOR_ID				0x19d2

#define ZTE_VENDOR_ID				0x19d2
@@ -628,6 +634,11 @@ static const struct option_blacklist_info telit_le920_blacklist = { 
	.reserved = BIT(1) | BIT(5),

	.reserved = BIT(1) | BIT(5),

};

};





static const struct option_blacklist_info telit_le920a4_blacklist_1 = {

	.sendsetup = BIT(0),

	.reserved = BIT(1),

};



static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = {

static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = {

	.sendsetup = BIT(2),

	.sendsetup = BIT(2),

	.reserved = BIT(0) | BIT(1) | BIT(3),

	.reserved = BIT(0) | BIT(1) | BIT(3),
@@ -1203,6 +1214,16 @@ static const struct usb_device_id option_ids[] = { 
		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },

		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),

		.driver_info = (kernel_ulong_t)&telit_le920_blacklist },

		.driver_info = (kernel_ulong_t)&telit_le920_blacklist },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1207) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1208),

		.driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1211),

		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1212),

		.driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),

		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),

		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },

		.driver_info = (kernel_ulong_t)&net_intf1_blacklist },

CRA Git | Maintained and supported by SUSTech CRA and CCSE