aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Naulls <peter@chocky.org>2012-01-17 21:27:09 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-24 14:22:16 -0500
commitfc216ec363f4d174932df90bbf35c77d0540e561 (patch)
treea0777a896349e5e057d68dc95f2e3947a27ae311 /drivers
parent55f13aeae0346f0c89bfface91ad9a97653dc433 (diff)
USB: serial: ftdi additional IDs
I tested this against 2.6.39 in the Ubuntu kernel, however I see the IDs are not in latest 3.2 git. This adds IDs for the FTDI controller in the Rainforest Automation Zigbee dongle. Signed-off-by: Peter Naulls <peter@chocky.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h6
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 5f42757930df..104aff536b1e 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -843,6 +843,7 @@ static struct usb_device_id id_table_combined [] = {
843 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 843 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
844 { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), 844 { USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
845 .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, 845 .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
846 { USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
846 { }, /* Optional parameter entry */ 847 { }, /* Optional parameter entry */
847 { } /* Terminating entry */ 848 { } /* Terminating entry */
848}; 849};
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f35ddef72e04..09237ffe2f33 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1175,3 +1175,9 @@
1175 */ 1175 */
1176/* TagTracer MIFARE*/ 1176/* TagTracer MIFARE*/
1177#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 1177#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0
1178
1179/*
1180 * Rainforest Automation
1181 */
1182/* ZigBee controller */
1183#define FTDI_RF_R106 0x8A28