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

Commit d726fb75 authored by Kevin Lloyd's avatar Kevin Lloyd Committed by Greg Kroah-Hartman
Browse files

USB: serial: move zte MF330 from sierra to option 



Move the Onda H600/ZTE MF33 device from the sierra driver to the option
driver.

The reason it was moved is because the sierra driver is starting to support
more and more sierra proprietary features, so it makes more sense to keep
sierra only devices in there.


Signed-off-by: default avatarKevin Lloyd <klloyd@sierrawireless.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5b0a4d66

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ static int option_send_setup(struct usb_serial_port *port); 
#define BANDRICH_PRODUCT_C100_1			0x1002

#define BANDRICH_PRODUCT_C100_2			0x1003



#define QUALCOMM_VENDOR_ID			0x05C6



static struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -193,6 +195,7 @@ static struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },

	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);

drivers/usb/serial/sierra.c

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ static struct usb_device_id id_table [] = { 


	{ USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */

	{ USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */

	{ USB_DEVICE(0x05C6, 0x6613), .driver_info = DEVICE_1_PORT }, /* Onda H600/ZTE MF330 */



	{ USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},

	{ }