lkml.org 
[lkml]   [2014]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 134/203] usb: serial: ftdi_sio: add Awinda Station and Dongle products
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Frans Klaver <frans.klaver@xsens.com>

    commit edd74ffab1f6909eee400c7de8ce621870aacac9 upstream.

    Add new IDs for the Xsens Awinda Station and Awinda Dongle.

    While at it, order the definitions by PID and add a logical separation
    between devices using Xsens' VID and those using FTDI's VID.

    Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
    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 | 6 +++++-
    2 files changed, 7 insertions(+), 1 deletion(-)

    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -674,6 +674,8 @@ static const struct usb_device_id id_tab
    { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
    { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
    { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
    + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
    + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
    { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
    { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
    --- a/drivers/usb/serial/ftdi_sio_ids.h
    +++ b/drivers/usb/serial/ftdi_sio_ids.h
    @@ -143,8 +143,12 @@
    * Xsens Technologies BV products (http://www.xsens.com).
    */
    #define XSENS_VID 0x2639
    -#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
    +#define XSENS_AWINDA_STATION_PID 0x0101
    +#define XSENS_AWINDA_DONGLE_PID 0x0102
    #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
    +#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
    +
    +/* Xsens devices using FTDI VID */
    #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
    #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
    #define XSENS_CONVERTER_2_PID 0xD38A



    \
     
     \ /
      Last update: 2014-11-12 03:21    [W:4.074 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site