| From fc216ec363f4d174932df90bbf35c77d0540e561 Mon Sep 17 00:00:00 2001 |
| From: Peter Naulls <peter@chocky.org> |
| Date: Tue, 17 Jan 2012 18:27:09 -0800 |
| Subject: USB: serial: ftdi additional IDs |
| |
| From: Peter Naulls <peter@chocky.org> |
| |
| commit fc216ec363f4d174932df90bbf35c77d0540e561 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/ftdi_sio.c | 1 + |
| drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ |
| 2 files changed, 7 insertions(+) |
| |
| --- 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_com |
| .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), |
| .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, |
| + { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, |
| { }, /* Optional parameter entry */ |
| { } /* Terminating entry */ |
| }; |
| --- a/drivers/usb/serial/ftdi_sio_ids.h |
| +++ b/drivers/usb/serial/ftdi_sio_ids.h |
| @@ -1175,3 +1175,9 @@ |
| */ |
| /* TagTracer MIFARE*/ |
| #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 |
| + |
| +/* |
| + * Rainforest Automation |
| + */ |
| +/* ZigBee controller */ |
| +#define FTDI_RF_R106 0x8A28 |