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

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

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

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

 into usb-next

Johan writes:

USB-serial updates for v4.17-rc1

Here are the USB-serial updates for 4.17-rc1, including a
reimplementation of the option-driver interface masking which allows
for a more compact notation when adding new device entries.

Included are also a couple of clean ups and a new ftdi_sio device id.

All but the device-id commit have been in linux-next (without any
reported issues).

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents c91815b5 79a0b331

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(PI_VID, PI_1014_PID) },

	{ USB_DEVICE(PI_VID, PI_1015_PID) },

	{ USB_DEVICE(PI_VID, PI_1016_PID) },

	{ USB_DEVICE(PI_VID, PI_E870_PID) },

	{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },

	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },

	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),

drivers/usb/serial/ftdi_sio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ 
#define PI_1014_PID	0x1014  /* PI Device */

#define PI_1015_PID	0x1015  /* PI Device */

#define PI_1016_PID	0x1016  /* PI Digital Servo Module */

#define PI_E870_PID	0x1019  /* PI E-870 Piezomotor Controller */



/*

 * Kondo Kagaku Co.Ltd.

drivers/usb/serial/option.c

+153 −304

File changed.

Preview size limit exceeded, changes collapsed.