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

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

Merge tag 'usb-serial-4.5-rc7' of... 

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

 into usb-linus

Jonan writes:

USB-serial fixes for v4.5-rc7

Here are some new device ids and a patch removing the mxu11x0 driver,
which turned out not to be needed.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents f4f41c5a 04fdbc82

drivers/usb/serial/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -475,22 +475,6 @@ config USB_SERIAL_MOS7840 
	  To compile this driver as a module, choose M here: the

	  module will be called mos7840.  If unsure, choose N.



config USB_SERIAL_MXUPORT11

	tristate "USB Moxa UPORT 11x0 Serial Driver"

	---help---

	  Say Y here if you want to use a MOXA UPort 11x0 Serial hub.



	  This driver supports:



	  - UPort 1110  : 1 port RS-232 USB to Serial Hub.

	  - UPort 1130  : 1 port RS-422/485 USB to Serial Hub.

	  - UPort 1130I : 1 port RS-422/485 USB to Serial Hub with Isolation.

	  - UPort 1150  : 1 port RS-232/422/485 USB to Serial Hub.

	  - UPort 1150I : 1 port RS-232/422/485 USB to Serial Hub with Isolation.



	  To compile this driver as a module, choose M here: the

	  module will be called mxu11x0.



config USB_SERIAL_MXUPORT

	tristate "USB Moxa UPORT Serial Driver"

	---help---

drivers/usb/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ obj-$(CONFIG_USB_SERIAL_METRO) += metro-usb.o 
obj-$(CONFIG_USB_SERIAL_MOS7720)		+= mos7720.o

obj-$(CONFIG_USB_SERIAL_MOS7840)		+= mos7840.o

obj-$(CONFIG_USB_SERIAL_MXUPORT)		+= mxuport.o

obj-$(CONFIG_USB_SERIAL_MXUPORT11)		+= mxu11x0.o

obj-$(CONFIG_USB_SERIAL_NAVMAN)			+= navman.o

obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o

obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opticon.o

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */

	{ USB_DEVICE(0x1901, 0x0190) }, /* GE B850 CP2105 Recorder interface */

	{ USB_DEVICE(0x1901, 0x0193) }, /* GE B650 CP2104 PMC interface */

	{ USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */

	{ USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */

	{ USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */

	{ USB_DEVICE(0x1BA4, 0x0002) },	/* Silicon Labs 358x factory default */

drivers/usb/serial/mxu11x0.c

deleted100644 → 0
+0 −1006

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/usb/serial/option.c

+5 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static void option_instat_callback(struct urb *urb); 
#define TELIT_PRODUCT_UE910_V2			0x1012

#define TELIT_PRODUCT_LE922_USBCFG0		0x1042

#define TELIT_PRODUCT_LE922_USBCFG3		0x1043

#define TELIT_PRODUCT_LE922_USBCFG5		0x1045

#define TELIT_PRODUCT_LE920			0x1200

#define TELIT_PRODUCT_LE910			0x1201
@@ -1132,6 +1133,8 @@ static const struct usb_device_id option_ids[] = { 
	{ 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 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
@@ -1183,6 +1186,8 @@ static const struct usb_device_id option_ids[] = { 
		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3),

		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },

	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),

		.driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),

		.driver_info = (kernel_ulong_t)&telit_le910_blacklist },

	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),