On Tue, May 16, 2017 at 11:54:41PM +0300, Andrey Korolyov wrote: > 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.
I had already fixed up and applied your v2, but ok let's convert the old entries as well for consistency and to make things easier for the stable maintainers. > Signed-off-by: Andrey Korolyov <[email protected]> > Cc: stable <[email protected]> > --- > drivers/usb/serial/ftdi_sio.c | 12 ++++++++---- > drivers/usb/serial/ftdi_sio_ids.h | 2 ++ > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c > index d38780f..3f6da7c 100644 > --- a/drivers/usb/serial/ftdi_sio.c > +++ b/drivers/usb/serial/ftdi_sio.c > @@ -809,10 +809,14 @@ static const struct usb_device_id id_table_combined[] = > { > { 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_TINY_PID, > + 1) }, > + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_TINY_H_PID, > + 1) }, > + { USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_OCD_H_PID, > + 1) }, No need to break these lines even if checkpatch complains. We're a bit more allowing for id tables. > { USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID), > .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, > { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), > diff --git a/drivers/usb/serial/ftdi_sio_ids.h > b/drivers/usb/serial/ftdi_sio_ids.h > index 71fb9e5..4fcf1ce 100644 > --- 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 > > /* Now applied, thanks. Johan -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
