aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJF Argentino <jf.argentino@free.fr>2011-03-09 16:13:20 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 18:40:05 -0500
commitb88ccf6f97ceb3f34cecbb513edc58815707187d (patch)
tree2d038f4e029da9e90bd2c097ac1a8ea9a3aa6ea0
parent7a89e4cb9cdaba92f5fbc509945cf4e3c48db4e2 (diff)
USB: serial: ftdi_sio: adding support for OLIMEX ARM-USB-OCD-H
Adding support for the OLIMEX ARM-USB-OCD-H JTAG device (id 15ba:002b) based on FTDI FT2232H Signed-off-by: JF Argentino <jf.argentino@free.fr> Acked-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 5a446710fb79..a75f9298d88f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -722,6 +722,8 @@ static struct usb_device_id id_table_combined [] = {
722 { USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) }, 722 { USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) },
723 { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID), 723 { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
724 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 724 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
725 { USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_H_PID),
726 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
725 { USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID), 727 { USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID),
726 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 728 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
727 { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), 729 { 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 117e8e6f93c6..c543e55bafba 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -730,6 +730,7 @@
730/* Olimex */ 730/* Olimex */
731#define OLIMEX_VID 0x15BA 731#define OLIMEX_VID 0x15BA
732#define OLIMEX_ARM_USB_OCD_PID 0x0003 732#define OLIMEX_ARM_USB_OCD_PID 0x0003
733#define OLIMEX_ARM_USB_OCD_H_PID 0x002b
733 734
734/* 735/*
735 * Telldus Technologies 736 * Telldus Technologies