aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2019-03-05 17:05:03 -0500
committerJohan Hovold <johan@kernel.org>2019-03-19 05:37:26 -0400
commit422c2537ba9d42320f8ab6573940269f87095320 (patch)
treebb27802bd93a270ade305d0d5035e2347cc65df6
parentd1252f0237238b912c3e7a51bf237acf34c97983 (diff)
USB: serial: ftdi_sio: add additional NovaTech products
Add PIDs for the NovaTech OrionLX+ and Orion I/O so they can be automatically detected. Signed-off-by: George McCollister <george.mccollister@gmail.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8f5b17471759..1d8461ae2c34 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -609,6 +609,8 @@ static const struct usb_device_id id_table_combined[] = {
609 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 609 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
610 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), 610 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),
611 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 611 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
612 { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },
613 { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },
612 { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, 614 { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
613 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) }, 615 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
614 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) }, 616 { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index b863bedb55a1..5755f0df0025 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -567,7 +567,9 @@
567/* 567/*
568 * NovaTech product ids (FTDI_VID) 568 * NovaTech product ids (FTDI_VID)
569 */ 569 */
570#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ 570#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */
571#define FTDI_NT_ORIONLX_PLUS_PID 0x7c91 /* OrionLX+ Substation Automation Platform */
572#define FTDI_NT_ORION_IO_PID 0x7c92 /* Orion I/O */
571 573
572/* 574/*
573 * Synapse Wireless product ids (FTDI_VID) 575 * Synapse Wireless product ids (FTDI_VID)