Commit a1d9bc12 authored by Matthias Urlichs's avatar Matthias Urlichs Committed by Greg Kroah-Hartman
Browse files

USB: option.c: add more device IDs 



Add devices by AMOI and NovatelWireless.

Signed-Off-By: default avatarMatthias Urlichs <matthias@urlichs.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80d97098

drivers/usb/serial/option.c

+9 −2
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static int option_send_setup(struct usb_serial_port *port); 
#define NOVATELWIRELESS_PRODUCT_EV620		0x2100

#define NOVATELWIRELESS_PRODUCT_ES720		0x2110

#define NOVATELWIRELESS_PRODUCT_E725		0x2120

#define NOVATELWIRELESS_PRODUCT_ES620		0x2130

#define NOVATELWIRELESS_PRODUCT_EU730		0x2400

#define NOVATELWIRELESS_PRODUCT_EU740		0x2410

#define NOVATELWIRELESS_PRODUCT_EU870D		0x2420
@@ -137,6 +138,8 @@ static int option_send_setup(struct usb_serial_port *port); 
#define NOVATELWIRELESS_PRODUCT_MC727		0x4100

#define NOVATELWIRELESS_PRODUCT_MC950D		0x4400



#define NOVATELWIRELESS_PRODUCT_U727		0x5010



/* FUTURE NOVATEL PRODUCTS */

#define NOVATELWIRELESS_PRODUCT_EVDO_1		0x6000

#define NOVATELWIRELESS_PRODUCT_HSPA_1		0x7000
@@ -163,6 +166,9 @@ static int option_send_setup(struct usb_serial_port *port); 
#define BANDRICH_PRODUCT_C100_1			0x1002

#define BANDRICH_PRODUCT_C100_2			0x1003



#define AMOI_VENDOR_ID			0x1614

#define AMOI_PRODUCT_9508			0x0800



#define QUALCOMM_VENDOR_ID			0x05C6



#define MAXON_VENDOR_ID				0x16d8
@@ -206,6 +212,7 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
@@ -218,13 +225,13 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel U727 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */