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

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

Merge tag 'usb-serial-5.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

  USB-serial fixes for 5.19-rc7

  Here are a couple of new device ids for ftdi_sio.

  Everything has been in linux-next with no reported issues.

* tag 'usb-serial-5.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: add Belimo device ids
parents 7e501332 7c239a07

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,9 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_DISPLAY_PID) },

	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_LITE_PID) },

	{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ANALOG_PID) },

	/* Belimo Automation devices */

	{ USB_DEVICE(FTDI_VID, BELIMO_ZTH_PID) },

	{ USB_DEVICE(FTDI_VID, BELIMO_ZIP_PID) },

	/* ICP DAS I-756xU devices */

	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7560U_PID) },

	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -1568,6 +1568,12 @@ 
#define CHETCO_SEASMART_LITE_PID	0xA5AE /* SeaSmart Lite USB Adapter */

#define CHETCO_SEASMART_ANALOG_PID	0xA5AF /* SeaSmart Analog Adapter */



/*

 * Belimo Automation

 */

#define BELIMO_ZTH_PID			0x8050

#define BELIMO_ZIP_PID			0xC811



/*

 * Unjo AB

 */