lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 069/196] USB: ftdi_sio: Added IDs for CTI USB Serial Devices
    Date
    From: Christian Simon <simon@swine.de>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 5a9443f08c83c294c5c806a689c1184b27cb26b3 upstream.

    I added new ProdutIds for two devices from CTI GmbH Leipzig.

    [PG: fix cosmetic whitespace warning coming from git am]

    Signed-off-by: Christian Simon <simon@swine.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/usb/serial/ftdi_sio.c | 2 ++
    drivers/usb/serial/ftdi_sio_ids.h | 8 ++++++++
    2 files changed, 10 insertions(+)

    diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
    index 05dcaa0..193a59b 100644
    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -155,6 +155,8 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk = {
    * /sys/bus/usb/ftdi_sio/new_id, then send patch/report!
    */
    static struct usb_device_id id_table_combined [] = {
    + { USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) },
    + { USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
    { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
    diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
    index 73d8c79..95846c5 100644
    --- a/drivers/usb/serial/ftdi_sio_ids.h
    +++ b/drivers/usb/serial/ftdi_sio_ids.h
    @@ -1146,3 +1146,11 @@
    */
    #define QIHARDWARE_VID 0x20B7
    #define MILKYMISTONE_JTAGSERIAL_PID 0x0713
    +
    +/*
    + * CTI GmbH RS485 Converter http://www.cti-lean.com/
    + */
    +/* USB-485-Mini*/
    +#define FTDI_CTI_MINI_PID 0xF608
    +/* USB-Nano-485*/
    +#define FTDI_CTI_NANO_PID 0xF60B
    --
    1.7.9.3


    \
     
     \ /
      Last update: 2012-03-13 01:59    [W:2.115 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site