aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBenedek László <benedekl@gmail.com>2011-04-19 21:22:21 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-29 19:45:22 -0400
commit37909fe588c9e09ab57cd267e98678a17ceda64a (patch)
tree48389a20e330c2d738f74ae02c347d1bfe5e6a79 /drivers/usb
parent3938a0b32dc12229e76735679b37095bc2bc1578 (diff)
USB: serial: ftdi_sio: adding support for TavIR STK500
Adding support for the TavIR STK500 (id 0403:FA33) Atmel AVR programmer device based on FTDI FT232RL. Signed-off-by: Benedek László <benedekl@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 4de6ef0ae52a..e8dbde55f6c5 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -566,6 +566,7 @@ static struct usb_device_id id_table_combined [] = {
566 { USB_DEVICE(FTDI_VID, FTDI_IBS_APP70_PID) }, 566 { USB_DEVICE(FTDI_VID, FTDI_IBS_APP70_PID) },
567 { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) }, 567 { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) },
568 { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) }, 568 { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) },
569 { USB_DEVICE(FTDI_VID, FTDI_TAVIR_STK500_PID) },
569 /* 570 /*
570 * ELV devices: 571 * ELV devices:
571 */ 572 */
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index efffc23723bd..1d946cd238ba 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -491,6 +491,11 @@
491/* www.canusb.com Lawicel CANUSB device (FTDI_VID) */ 491/* www.canusb.com Lawicel CANUSB device (FTDI_VID) */
492#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */ 492#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
493 493
494/*
495 * TavIR AVR product ids (FTDI_VID)
496 */
497#define FTDI_TAVIR_STK500_PID 0xFA33 /* STK500 AVR programmer */
498
494 499
495 500
496/********************************/ 501/********************************/