lkml.org 
[lkml]   [2017]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 072/164] USB: serial: ftdi_sio: add Olimex ARM-USB-TINY(H) PIDs
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Andrey Korolyov <andrey@xdel.ru>

    commit 5f63424ab7daac840df2b12dd5bcc5b38d50f779 upstream.

    This patch adds support for recognition of ARM-USB-TINY(H) devices which
    are almost identical to ARM-USB-OCD(H) but lacking separate barrel jack
    and serial console.

    By suggestion from Johan Hovold it is possible to replace
    ftdi_jtag_quirk with a bit more generic construction. Since all
    Olimex-ARM debuggers has exactly two ports, we could safely always use
    only second port within the debugger family.

    Signed-off-by: Andrey Korolyov <andrey@xdel.ru>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/ftdi_sio.c | 8 ++++----
    drivers/usb/serial/ftdi_sio_ids.h | 2 ++
    2 files changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/usb/serial/ftdi_sio.c
    +++ b/drivers/usb/serial/ftdi_sio.c
    @@ -809,10 +809,10 @@ static const struct usb_device_id id_tab
    { USB_DEVICE(FTDI_VID, FTDI_PROPOX_ISPCABLEIII_PID) },
    { USB_DEVICE(FTDI_VID, CYBER_CORTEX_AV_PID),
    .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    - { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
    - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    - { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_H_PID),
    - .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID, 1) },
    + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_OCD_H_PID, 1) },
    + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_TINY_PID, 1) },
    + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_TINY_H_PID, 1) },
    { USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID),
    .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
    { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID),
    --- a/drivers/usb/serial/ftdi_sio_ids.h
    +++ b/drivers/usb/serial/ftdi_sio_ids.h
    @@ -882,6 +882,8 @@
    /* Olimex */
    #define OLIMEX_VID 0x15BA
    #define OLIMEX_ARM_USB_OCD_PID 0x0003
    +#define OLIMEX_ARM_USB_TINY_PID 0x0004
    +#define OLIMEX_ARM_USB_TINY_H_PID 0x002a
    #define OLIMEX_ARM_USB_OCD_H_PID 0x002b

    /*

    \
     
     \ /
      Last update: 2017-05-23 23:44    [W:2.362 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site