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

Merge tag 'usb-serial-3.17-rc2' of... 

Merge tag 'usb-serial-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into work-linus

Johan writes:

USB-serial fixes for v3.17-rc2

These updates fix the log level for some option log messages that started
bothering people after a recent change.

They also fix some issues reported against the zte_ev driver by moving most
device ids back from the zte_ev driver to the option driver (and removing two
duplicate ids). The zte_ev driver is planned to be removed in 3.18.

Some new device ids are also added.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 6835a3a0 646907f5

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_BM_ATOM_NANO_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_NXTCAM_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_EV3CON_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
@@ -934,6 +935,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },

	/* ekey Devices */

	{ USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },

	/* Infineon Devices */

	{ USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) },

	{ }					/* Terminating entry */

drivers/usb/serial/ftdi_sio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
/* www.candapter.com Ewert Energy Systems CANdapter device */

#define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */



#define FTDI_BM_ATOM_NANO_PID	0xa559	/* Basic Micro ATOM Nano USB2Serial */



/*

 * Texas Instruments XDS100v2 JTAG / BeagleBone A3

 * http://processors.wiki.ti.com/index.php/XDS100
@@ -1378,3 +1380,8 @@ 
#define BRAINBOXES_US_160_6_PID		0x9006 /* US-160 16xRS232 1Mbaud Port 11 and 12 */

#define BRAINBOXES_US_160_7_PID		0x9007 /* US-160 16xRS232 1Mbaud Port 13 and 14 */

#define BRAINBOXES_US_160_8_PID		0x9008 /* US-160 16xRS232 1Mbaud Port 15 and 16 */



/*

 * ekey biometric systems GmbH (http://ekey.net/)

 */

#define FTDI_EKEY_CONV_USB_PID		0xCB08	/* Converter USB */

drivers/usb/serial/option.c

+28 −3
Original line number Diff line number Diff line
@@ -275,8 +275,12 @@ static void option_instat_callback(struct urb *urb); 
#define ZTE_PRODUCT_MF622			0x0001

#define ZTE_PRODUCT_MF628			0x0015

#define ZTE_PRODUCT_MF626			0x0031

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AC2726			0xfff1

#define ZTE_PRODUCT_CDMA_TECH			0xfffe

#define ZTE_PRODUCT_AC8710T			0xffff

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AD3812			0xffeb

#define ZTE_PRODUCT_MC2716			0xffed



#define BENQ_VENDOR_ID				0x04a5

#define BENQ_PRODUCT_H10			0x4068
@@ -494,6 +498,10 @@ static void option_instat_callback(struct urb *urb); 
#define INOVIA_VENDOR_ID			0x20a6

#define INOVIA_SEW858				0x1105



/* VIA Telecom */

#define VIATELECOM_VENDOR_ID			0x15eb

#define VIATELECOM_PRODUCT_CDS7			0x0001



/* some devices interfaces need special handling due to a number of reasons */

enum option_blacklist_reason {

		OPTION_BLACKLIST_NONE = 0,
@@ -527,10 +535,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = { 
	.reserved = BIT(4),

};



static const struct option_blacklist_info zte_ad3812_z_blacklist = {

	.sendsetup = BIT(0) | BIT(1) | BIT(2),

};



static const struct option_blacklist_info zte_mc2718_z_blacklist = {

	.sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),

};



static const struct option_blacklist_info zte_mc2716_z_blacklist = {

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

};



static const struct option_blacklist_info huawei_cdc12_blacklist = {

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

};
@@ -1070,6 +1086,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012, 0xff) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */

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

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
@@ -1544,13 +1561,18 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) },



	/* NOTE: most ZTE CDMA devices should be driven by zte_ev, not option */

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },

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

	 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },

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

	 .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },

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

	 .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },



	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },

	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
@@ -1724,6 +1746,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */

	{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },

	{ USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) },

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);
@@ -1916,6 +1939,8 @@ static void option_instat_callback(struct urb *urb) 
			dev_dbg(dev, "%s: type %x req %x\n", __func__,

				req_pkt->bRequestType, req_pkt->bRequest);

		}

	} else if (status == -ENOENT || status == -ESHUTDOWN) {

		dev_dbg(dev, "%s: urb stopped: %d\n", __func__, status);

	} else

		dev_err(dev, "%s: error %d\n", __func__, status);

drivers/usb/serial/pl2303.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) },

	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) },

	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) },

	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) },

	{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },

	{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },

	{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },

drivers/usb/serial/pl2303.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#define PL2303_PRODUCT_ID_GPRS		0x0609

#define PL2303_PRODUCT_ID_HCR331	0x331a

#define PL2303_PRODUCT_ID_MOTOROLA	0x0307

#define PL2303_PRODUCT_ID_ZTEK		0xe1f1



#define ATEN_VENDOR_ID		0x0557

#define ATEN_VENDOR_ID2		0x0547

CRA Git | Maintained and supported by SUSTech CRA and CCSE