aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMitchell Solomon <mitchjs@rush2112.net>2010-02-12 13:23:18 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:54:53 -0500
commit9714080d20f2ec4b671a06ce69367d91fa9e227e (patch)
treecc237e47087cf9a9bfcab8a6872abd1caa9ad5e0 /drivers/usb
parentbd09a9f5318d0a088605911325d6e6e8530bdc9a (diff)
USB: add new ftdi_sio device ids
PID patch for my products Signed-off-by: Mitchell Solomon <mitchjs@rush2112.net> 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.c4
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 82612997f92c..d59262ecc229 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -738,6 +738,10 @@ static struct usb_device_id id_table_combined [] = {
738 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 738 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
739 { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, 739 { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
740 { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) }, 740 { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
741 { USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) },
742 { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },
743 { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) },
744 { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) },
741 { }, /* Optional parameter entry */ 745 { }, /* Optional parameter entry */
742 { } /* Terminating entry */ 746 { } /* Terminating entry */
743}; 747};
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index f9efd9717170..612a788f2ed9 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1002,3 +1002,11 @@
1002#define EVO_8U232AM_PID 0x02FF /* Evolution robotics RCM2 (FT232AM)*/ 1002#define EVO_8U232AM_PID 0x02FF /* Evolution robotics RCM2 (FT232AM)*/
1003#define EVO_HYBRID_PID 0x0302 /* Evolution robotics RCM4 PID (FT232BM)*/ 1003#define EVO_HYBRID_PID 0x0302 /* Evolution robotics RCM4 PID (FT232BM)*/
1004#define EVO_RCM4_PID 0x0303 /* Evolution robotics RCM4 PID */ 1004#define EVO_RCM4_PID 0x0303 /* Evolution robotics RCM4 PID */
1005
1006/*
1007 * MJS Gadgets HD Radio / XM Radio / Sirius Radio interfaces (using VID 0x0403)
1008 */
1009#define MJSG_GENERIC_PID 0x9378
1010#define MJSG_SR_RADIO_PID 0x9379
1011#define MJSG_XM_RADIO_PID 0x937A
1012#define MJSG_HD_RADIO_PID 0x937C