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: Johan Hovold <johan@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEHszNKQClByu0A+9RQQ3kT97htJUFAlrh/IARHGpvaGFuQGtl
 cm5lbC5vcmcACgkQQQ3kT97htJW24BAAh2znk+Yj/GCxGe4Le0x0kua1c0bDeUsJ
 XsTCF/HZbb5wzUVyl1JZhm7C11NcPH/sBPi524k5+ztFSETCDaHMFDtF9QEtYw7K
 zWHSqdLwqgIaksqxMpSXfCAJsZO0K/SfUxvZfp7ETzXC2RP0wANzVV4ylDOV+cjd
 cSfPfPORC6SSkm2cYcN/WXGk4l4sDA6LAW9aMDfLg4ZUJuFn3WQmYtM+p5dbw5E3
 lkyELkd6vZdMJxkQTuV7MxNmv6Kt0DD9vQTvSpJ10WTaZ7mx0UzezJ5dm8ZJg4v7
 k8iFXzzJeybmuv8oGFaXWZTfbwIx6bcZFhzoo4xQDAIUY1RhvU8OVAMH9QiM+sle
 /kvVrY5z4qbKqj+8fZQsA64/OVrXyuU9QOQCUFF3oqcilflhmvaqRZgewmOE9FVm
 T6a5xTko+4nr9oVcdusAfsKQ5JcdFTuQ+t/bKV7ygGAlKBYShMxI/8BadTXOUSlf
 PahwAm6Wlzn/uFM+0tYIBmOkoNlLnaK39f/g0WrwYnaSaRPKwDIW90FUK/w73e6g
 KqeXDTNWRsCUPJ4DwjUg95XVBwbEvDBq7po8OAfsDc9Cz/fSibKco6fGFTBR7OBN
 XUhEomqdXaHdxqSe1Y5FbU6vMnqH9Fqd5svqLr7ReCEPwRcDDbaMU+s1Mf3Gck8D
 dQ2Rd517nnc=
 =5u11
 -----END PGP SIGNATURE-----

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: Johan Hovold <johan@kernel.org>
This commit is contained in:
Greg Kroah-Hartman 2018-04-26 19:29:24 +02:00
Родитель be75d8f1da 470b5d6f0c
Коммит 573a094873
4 изменённых файлов: 11 добавлений и 1 удалений

Просмотреть файл

@ -62,6 +62,7 @@ config USB_SERIAL_SIMPLE
- Fundamental Software dongle. - Fundamental Software dongle.
- Google USB serial devices - Google USB serial devices
- HP4x calculators - HP4x calculators
- Libtransistor USB console
- a number of Motorola phones - a number of Motorola phones
- Motorola Tetra devices - Motorola Tetra devices
- Novatel Wireless GPS receivers - Novatel Wireless GPS receivers

Просмотреть файл

@ -214,6 +214,7 @@ static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */ { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
{ USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */ { USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */
{ USB_DEVICE(0x3195, 0xF281) }, /* 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 */ { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
{ } /* Terminating Entry */ { } /* Terminating Entry */
}; };

Просмотреть файл

@ -1898,7 +1898,8 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
return ftdi_jtag_probe(serial); return ftdi_jtag_probe(serial);
if (udev->product && 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"))) !strcmp(udev->product, "SNAP Connect E10")))
return ftdi_jtag_probe(serial); return ftdi_jtag_probe(serial);

Просмотреть файл

@ -63,6 +63,11 @@ DEVICE(flashloader, FLASHLOADER_IDS);
0x01) } 0x01) }
DEVICE(google, GOOGLE_IDS); DEVICE(google, GOOGLE_IDS);
/* Libtransistor USB console */
#define LIBTRANSISTOR_IDS() \
{ USB_DEVICE(0x1209, 0x8b00) }
DEVICE(libtransistor, LIBTRANSISTOR_IDS);
/* ViVOpay USB Serial Driver */ /* ViVOpay USB Serial Driver */
#define VIVOPAY_IDS() \ #define VIVOPAY_IDS() \
{ USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */ { USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
@ -110,6 +115,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
&funsoft_device, &funsoft_device,
&flashloader_device, &flashloader_device,
&google_device, &google_device,
&libtransistor_device,
&vivopay_device, &vivopay_device,
&moto_modem_device, &moto_modem_device,
&motorola_tetra_device, &motorola_tetra_device,
@ -126,6 +132,7 @@ static const struct usb_device_id id_table[] = {
FUNSOFT_IDS(), FUNSOFT_IDS(),
FLASHLOADER_IDS(), FLASHLOADER_IDS(),
GOOGLE_IDS(), GOOGLE_IDS(),
LIBTRANSISTOR_IDS(),
VIVOPAY_IDS(), VIVOPAY_IDS(),
MOTO_IDS(), MOTO_IDS(),
MOTOROLA_TETRA_IDS(), MOTOROLA_TETRA_IDS(),