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

Commit 69806d56 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: new Novatel device ids for option driver 



This moves all of the Novatel device ids to the option driver, where
they belong.

Thanks to Novatel for providing a list of all supported devices.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 774f78cf

drivers/usb/serial/airprime.c

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ 
static struct usb_device_id id_table [] = {

	{ USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */

	{ USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */

	{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */

	{ USB_DEVICE(0x1410, 0x1130) }, /* Novatel Wireless S720 CDMA/EV-DO */

	{ USB_DEVICE(0x1410, 0x1430) },	/* Novatel Merlin XU870 HSDPA/3G */

	{ USB_DEVICE(0x1410, 0x2100) }, /* Novatel Wireless EV620 CDMA/EV-DO */

	{ USB_DEVICE(0x1410, 0x2110) }, /* Novatel Wireless U720 CDMA/EV-DO */

	{ USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */

	{ },

};

drivers/usb/serial/option.c

+13 −2
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ static int option_send_setup(struct usb_serial_port *port); 
#define HUAWEI_PRODUCT_E220			0x1003



#define NOVATELWIRELESS_VENDOR_ID		0x1410

#define NOVATELWIRELESS_PRODUCT_U740		0x1400



#define ANYDATA_VENDOR_ID			0x16d5

#define ANYDATA_PRODUCT_ID			0x6501
@@ -152,7 +151,19 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_NETWORK) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1130) }, /* Novatel Merlin S720 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1400) }, /* Novatel U730 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1410) }, /* Novatel U740 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1420) }, /* Novatel EU870 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel XU870 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2100) }, /* Novatel EV620 CDMA/EV-DO */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */

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

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */

	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },

	{ } /* Terminating entry */

};