Skip to content

Commit 3486af8

Browse files
committed
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
2 parents 7e50133 + 7c239a0 commit 3486af8

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/usb/serial/ftdi_sio.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,9 @@ static const struct usb_device_id id_table_combined[] = {
10231023
{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_DISPLAY_PID) },
10241024
{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_LITE_PID) },
10251025
{ USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ANALOG_PID) },
1026+
/* Belimo Automation devices */
1027+
{ USB_DEVICE(FTDI_VID, BELIMO_ZTH_PID) },
1028+
{ USB_DEVICE(FTDI_VID, BELIMO_ZIP_PID) },
10261029
/* ICP DAS I-756xU devices */
10271030
{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7560U_PID) },
10281031
{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },

drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,12 @@
15681568
#define CHETCO_SEASMART_LITE_PID 0xA5AE /* SeaSmart Lite USB Adapter */
15691569
#define CHETCO_SEASMART_ANALOG_PID 0xA5AF /* SeaSmart Analog Adapter */
15701570

1571+
/*
1572+
* Belimo Automation
1573+
*/
1574+
#define BELIMO_ZTH_PID 0x8050
1575+
#define BELIMO_ZIP_PID 0xC811
1576+
15711577
/*
15721578
* Unjo AB
15731579
*/

0 commit comments

Comments
 (0)