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

Commit 444f94e9 authored by Schemmel Hans-Christoph's avatar Schemmel Hans-Christoph Committed by Johan Hovold
Browse files

USB: serial: option: add support for Cinterion PH8 and AHxx 



Added support for Gemalto's Cinterion PH8 and AHxx products
with 2 RmNet Interfaces and products with 1 RmNet + 1 USB Audio interface.

In addition some minor renaming and formatting.

Signed-off-by: default avatarHans-Christoph Schemmel <hans-christoph.schemmel@gemalto.com>
[johan: sort current entries and trim trailing whitespace ]
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 04974df8

drivers/usb/serial/option.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -375,18 +375,22 @@ static void option_instat_callback(struct urb *urb); 
#define HAIER_PRODUCT_CE81B			0x10f8

#define HAIER_PRODUCT_CE81B			0x10f8

#define HAIER_PRODUCT_CE100			0x2009

#define HAIER_PRODUCT_CE100			0x2009





/* Cinterion (formerly Siemens) products */

/* Gemalto's Cinterion products (formerly Siemens) */

#define SIEMENS_VENDOR_ID			0x0681

#define SIEMENS_VENDOR_ID			0x0681

#define CINTERION_VENDOR_ID			0x1e2d

#define CINTERION_VENDOR_ID			0x1e2d

#define CINTERION_PRODUCT_HC25_MDM		0x0047

#define CINTERION_PRODUCT_HC25_MDMNET		0x0040

#define CINTERION_PRODUCT_HC25_MDMNET		0x0040

#define CINTERION_PRODUCT_HC28_MDM		0x004C

#define CINTERION_PRODUCT_HC25_MDM		0x0047

#define CINTERION_PRODUCT_HC28_MDMNET		0x004A /* same for HC28J */

#define CINTERION_PRODUCT_HC28_MDMNET		0x004A /* same for HC28J */

#define CINTERION_PRODUCT_HC28_MDM		0x004C

#define CINTERION_PRODUCT_EU3_E			0x0051

#define CINTERION_PRODUCT_EU3_E			0x0051

#define CINTERION_PRODUCT_EU3_P			0x0052

#define CINTERION_PRODUCT_EU3_P			0x0052

#define CINTERION_PRODUCT_PH8			0x0053

#define CINTERION_PRODUCT_PH8			0x0053

#define CINTERION_PRODUCT_AHXX			0x0055

#define CINTERION_PRODUCT_AHXX			0x0055

#define CINTERION_PRODUCT_PLXX			0x0060

#define CINTERION_PRODUCT_PLXX			0x0060

#define CINTERION_PRODUCT_PH8_2RMNET		0x0082

#define CINTERION_PRODUCT_PH8_AUDIO		0x0083

#define CINTERION_PRODUCT_AHXX_2RMNET		0x0084

#define CINTERION_PRODUCT_AHXX_AUDIO		0x0085





/* Olivetti products */

/* Olivetti products */

#define OLIVETTI_VENDOR_ID			0x0b3c

#define OLIVETTI_VENDOR_ID			0x0b3c
@@ -633,6 +637,10 @@ static const struct option_blacklist_info telit_le922_blacklist_usbcfg3 = { 
	.reserved = BIT(1) | BIT(2) | BIT(3),

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

};

};





static const struct option_blacklist_info cinterion_rmnet2_blacklist = {

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

};



static const struct usb_device_id option_ids[] = {

static const struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -1712,6 +1720,12 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX, 0xff) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_2RMNET, 0xff),

		.driver_info = (kernel_ulong_t)&cinterion_rmnet2_blacklist },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_AUDIO, 0xff),

		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) },

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },