diff options
author | Mitchell Solomon <mitchjs@rush2112.net> | 2010-02-12 13:23:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 12:06:58 -0400 |
commit | 8abdcf11e07333d3a0d37c6b77c7574d8dbb8dca (patch) | |
tree | 34c6b34e4870a3479fd47723fe693d69ad6913d0 /drivers | |
parent | e6a9c52471f3be745d05a78d3bed3b09d410f9c6 (diff) |
USB: add new ftdi_sio device ids
commit 9714080d20f2ec4b671a06ce69367d91fa9e227e upstream.
PID patch for my products
Signed-off-by: Mitchell Solomon <mitchjs@rush2112.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 7638828e7317..53bec70848d8 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -737,6 +737,10 @@ static struct usb_device_id id_table_combined [] = { | |||
737 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 737 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
738 | { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, | 738 | { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, |
739 | { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) }, | 739 | { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) }, |
740 | { USB_DEVICE(FTDI_VID, MJSG_GENERIC_PID) }, | ||
741 | { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, | ||
742 | { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) }, | ||
743 | { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) }, | ||
740 | { }, /* Optional parameter entry */ | 744 | { }, /* Optional parameter entry */ |
741 | { } /* Terminating entry */ | 745 | { } /* Terminating entry */ |
742 | }; | 746 | }; |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index c8951aeed983..d1ead4ecdd3e 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 | ||