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

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

Merge tag 'usb-serial-4.17-rc3' of... 

Merge tag 'usb-serial-4.17-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v4.17-rc3

Here are a few device ids for -rc3, including a new "simple driver".

All have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents be75d8f1 470b5d6f

drivers/usb/serial/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config USB_SERIAL_SIMPLE 
		- Fundamental Software dongle.

		- Google USB serial devices

		- HP4x calculators

		- Libtransistor USB console

		- a number of Motorola phones

		- Motorola Tetra devices

		- Novatel Wireless GPS receivers

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */

	{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */

	{ USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */

	{ USB_DEVICE(0x3923, 0x7A0B) }, /* National Instruments USB Serial Console */

	{ USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */

	{ } /* Terminating Entry */

};

drivers/usb/serial/ftdi_sio.c

+2 −1
Original line number Diff line number Diff line
@@ -1898,7 +1898,8 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) 
		return ftdi_jtag_probe(serial);



	if (udev->product &&

		(!strcmp(udev->product, "BeagleBone/XDS100V2") ||

		(!strcmp(udev->product, "Arrow USB Blaster") ||

		 !strcmp(udev->product, "BeagleBone/XDS100V2") ||

		 !strcmp(udev->product, "SNAP Connect E10")))

		return ftdi_jtag_probe(serial);

drivers/usb/serial/usb-serial-simple.c

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ DEVICE(flashloader, FLASHLOADER_IDS); 
					0x01) }

DEVICE(google, GOOGLE_IDS);



/* Libtransistor USB console */

#define LIBTRANSISTOR_IDS()			\

	{ USB_DEVICE(0x1209, 0x8b00) }

DEVICE(libtransistor, LIBTRANSISTOR_IDS);



/* ViVOpay USB Serial Driver */

#define VIVOPAY_IDS()			\

	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
@@ -110,6 +115,7 @@ static struct usb_serial_driver * const serial_drivers[] = { 
	&funsoft_device,

	&flashloader_device,

	&google_device,

	&libtransistor_device,

	&vivopay_device,

	&moto_modem_device,

	&motorola_tetra_device,
@@ -126,6 +132,7 @@ static const struct usb_device_id id_table[] = { 
	FUNSOFT_IDS(),

	FLASHLOADER_IDS(),

	GOOGLE_IDS(),

	LIBTRANSISTOR_IDS(),

	VIVOPAY_IDS(),

	MOTO_IDS(),

	MOTOROLA_TETRA_IDS(),