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

Merge tag 'usb-serial-5.1-rc1-2' of... 

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

 into usb-next

Johan writes:

USB-serial fixes for 5.1-rc1

Here are a couple of new device ids for 5.1-rc1.

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

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.1-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485
  USB: serial: cp210x: add ID for Ingenico 3070
parents c9835df3 8d7fa3d4

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */

	{ USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */

	{ USB_DEVICE(0x0908, 0x01FF) }, /* Siemens RUGGEDCOM USB Serial Console */

	{ USB_DEVICE(0x0B00, 0x3070) }, /* Ingenico 3070 */

	{ USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */

	{ USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */

	{ USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_BT_USB_PID) },

	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_WL_USB_PID) },

	{ USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) },

	/* EZPrototypes devices */

	{ USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) },

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,12 @@ 
#define IONICS_VID			0x1c0c

#define IONICS_PLUGCOMPUTER_PID		0x0102



/*

 * EZPrototypes (PID reseller)

 */

#define EZPROTOTYPES_VID		0x1c40

#define HJELMSLUND_USB485_ISO_PID	0x0477



/*

 * Dresden Elektronik Sensor Terminal Board

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE