lkml.org 
[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 42/50] USB: serial: ftdi_sio: add additional NovaTech products
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: George McCollister <george.mccollister@gmail.com>

    commit 422c2537ba9d42320f8ab6573940269f87095320 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/ftdi_sio.c | 2 ++
    drivers/usb/serial/ftdi_sio_ids.h | 4 +++-
    2 files changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -604,6 +604,8 @@ static const struct usb_device_id id_tab
    .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),
    .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    + { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },
    + { USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
    --- a/drivers/usb/serial/ftdi_sio_ids.h
    +++ b/drivers/usb/serial/ftdi_sio_ids.h
    @@ -566,7 +566,9 @@
    /*
    * NovaTech product ids (FTDI_VID)
    */
    -#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */
    +#define FTDI_NT_ORIONLXM_PID 0x7c90 /* OrionLXm Substation Automation Platform */
    +#define FTDI_NT_ORIONLX_PLUS_PID 0x7c91 /* OrionLX+ Substation Automation Platform */
    +#define FTDI_NT_ORION_IO_PID 0x7c92 /* Orion I/O */

    /*
    * Synapse Wireless product ids (FTDI_VID)

    \
     
     \ /
      Last update: 2019-04-01 19:40    [W:3.530 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site