diff options
author | Colin Leitner <colin.leitner@googlemail.com> | 2010-07-01 04:49:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-26 15:00:58 -0400 |
commit | 77dbd74e16b566e9d5eeb4be18ae3ee7d5902bd3 (patch) | |
tree | 385be03d68316ac7fd00f8e990bb36c10634ab22 /drivers | |
parent | 00c05aabf228d220b6189a314d181bad1a09718f (diff) |
USB: ftdi_sio: support for Signalyzer tools based on FTDI chips
ftdi_sio: support for Signalyzer tools based on FTDI chips
This patch adds support for the Xverve Signalyzers.
Signed-off-by: Colin Leitner <colin.leitner@googlemail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index da7e334b0407..1d2a27b3ebb3 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -737,6 +737,14 @@ static struct usb_device_id id_table_combined [] = { | |||
737 | { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, | 737 | { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) }, |
738 | { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) }, | 738 | { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) }, |
739 | { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) }, | 739 | { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) }, |
740 | { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_ST_PID), | ||
741 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
742 | { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID), | ||
743 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
744 | { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID), | ||
745 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
746 | { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID), | ||
747 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
740 | { }, /* Optional parameter entry */ | 748 | { }, /* Optional parameter entry */ |
741 | { } /* Terminating entry */ | 749 | { } /* Terminating entry */ |
742 | }; | 750 | }; |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index bbc159a1df45..9c5d9cb25de1 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -1017,3 +1017,12 @@ | |||
1017 | #define MJSG_SR_RADIO_PID 0x9379 | 1017 | #define MJSG_SR_RADIO_PID 0x9379 |
1018 | #define MJSG_XM_RADIO_PID 0x937A | 1018 | #define MJSG_XM_RADIO_PID 0x937A |
1019 | #define MJSG_HD_RADIO_PID 0x937C | 1019 | #define MJSG_HD_RADIO_PID 0x937C |
1020 | |||
1021 | /* | ||
1022 | * Xverve Signalyzer tools (http://www.signalyzer.com/) | ||
1023 | */ | ||
1024 | #define XVERVE_SIGNALYZER_ST_PID 0xBCA0 | ||
1025 | #define XVERVE_SIGNALYZER_SLITE_PID 0xBCA1 | ||
1026 | #define XVERVE_SIGNALYZER_SH2_PID 0xBCA2 | ||
1027 | #define XVERVE_SIGNALYZER_SH4_PID 0xBCA4 | ||
1028 | |||