projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| c7d52c6a GKH |
1 | From 422c2537ba9d42320f8ab6573940269f87095320 Mon Sep 17 00:00:00 2001 |
| 2 | From: George McCollister <george.mccollister@gmail.com> | |
| 3 | Date: Tue, 5 Mar 2019 16:05:03 -0600 | |
| 4 | Subject: USB: serial: ftdi_sio: add additional NovaTech products | |
| 5 | ||
| 6 | From: George McCollister <george.mccollister@gmail.com> | |
| 7 | ||
| 8 | commit 422c2537ba9d42320f8ab6573940269f87095320 upstream. | |
| 9 | ||
| 10 | Add PIDs for the NovaTech OrionLX+ and Orion I/O so they can be | |
| 11 | automatically detected. | |
| 12 | ||
| 13 | Signed-off-by: George McCollister <george.mccollister@gmail.com> | |
| 14 | Cc: stable <stable@vger.kernel.org> | |
| 15 | Signed-off-by: Johan Hovold <johan@kernel.org> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/usb/serial/ftdi_sio.c | 2 ++ | |
| 20 | drivers/usb/serial/ftdi_sio_ids.h | 4 +++- | |
| 21 | 2 files changed, 5 insertions(+), 1 deletion(-) | |
| 22 | ||
| 23 | --- a/drivers/usb/serial/ftdi_sio.c | |
| 24 | +++ b/drivers/usb/serial/ftdi_sio.c | |
| 25 | @@ -604,6 +604,8 @@ static const struct usb_device_id id_tab | |
| 26 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | |
| 27 | { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), | |
| 28 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | |
| 29 | + { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) }, | |
| 30 | + { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) }, | |
| 31 | { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, | |
| 32 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) }, | |
| 33 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) }, | |
| 34 | --- a/drivers/usb/serial/ftdi_sio_ids.h | |
| 35 | +++ b/drivers/usb/serial/ftdi_sio_ids.h | |
| 36 | @@ -567,7 +567,9 @@ | |
| 37 | /* | |
| 38 | * NovaTech product ids (FTDI_VID) | |
| 39 | */ | |
| 40 | -#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ | |
| 41 | +#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */ | |
| 42 | +#define FTDI_NT_ORIONLX_PLUS_PID 0x7c91 /* OrionLX+ Substation Automation Platform */ | |
| 43 | +#define FTDI_NT_ORION_IO_PID 0x7c92 /* Orion I/O */ | |
| 44 | ||
| 45 | /* | |
| 46 | * Synapse Wireless product ids (FTDI_VID) |