aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorKjell Myksvoll <kmyksvo@gmail.com>2006-10-22 17:26:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-11-16 17:26:11 -0500
commit40c36092f75ae2026e35feb4f85caa143b64423a (patch)
tree1c7b637305eca86242a9eb081a14b182751b08b9 /drivers/usb
parent3da2495c0a92723d58cacaaff48dc60a29ddaae6 (diff)
USB: ftdi_sio: adds vendor/product id for a RFID construction kit
Adds the vendor and prodcut id for a RFID construction kit from the Elektor Electronics magazine, september 2006. From: Kjell Myksvoll <kmyksvo@gmail.com> 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.h8
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index bd76b4c11fcc..c971d7873792 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -511,6 +511,7 @@ static struct usb_device_id id_table_combined [] = {
511 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13M_PID) }, 511 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13M_PID) },
512 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13S_PID) }, 512 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13S_PID) },
513 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13U_PID) }, 513 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13U_PID) },
514 { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
514 { }, /* Optional parameter entry */ 515 { }, /* Optional parameter entry */
515 { } /* Terminating entry */ 516 { } /* Terminating entry */
516}; 517};
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index f0edb87d2dd5..30921f558ee1 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -175,9 +175,15 @@
175#define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */ 175#define FTDI_ASK_RDR400_PID 0xC991 /* ASK RDR 400 series card reader */
176 176
177/* 177/*
178 * FTDI USB UART chips used in construction projects from the
179 * Elektor Electronics magazine (http://elektor-electronics.co.uk)
180 */
181#define ELEKTOR_VID 0x0C7D
182#define ELEKTOR_FT323R_PID 0x0005 /* RFID-Reader, issue 09-2006 */
183
184/*
178 * DSS-20 Sync Station for Sony Ericsson P800 185 * DSS-20 Sync Station for Sony Ericsson P800
179 */ 186 */
180
181#define FTDI_DSS20_PID 0xFC82 187#define FTDI_DSS20_PID 0xFC82
182 188
183/* 189/*