diff options
author | Ozan Çağlayan <ozancag@gmail.com> | 2012-08-10 10:25:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-26 18:12:12 -0400 |
commit | d0f56add7cd65221d04964de9cc78bddebe2ecae (patch) | |
tree | 3d7253492c6b44a60998855d3448ae494f3b78e8 | |
parent | bb82df1a3fd0ab9ddab5134abe3e79917cd90954 (diff) |
USB: ftdi_sio: Add VID/PID for Kondo Serial USB
commit 7724a1edbe463b06d4e7831a41149ba095b16c53 upstream.
This adds VID/PID for Kondo Kagaku Co. Ltd. Serial USB Adapter
interface:
http://www.kondo-robot.com/EN/wp/?cat=28
Tested by controlling an RCB3 board using libRCB3.
Signed-off-by: Ozan Çağlayan <ozancag@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 86fc8fcf278..535a307ba26 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -809,6 +809,7 @@ static struct usb_device_id id_table_combined [] = { | |||
809 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, | 809 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, |
810 | { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, | 810 | { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, |
811 | { USB_DEVICE(PI_VID, PI_E861_PID) }, | 811 | { USB_DEVICE(PI_VID, PI_E861_PID) }, |
812 | { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, | ||
812 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, | 813 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, |
813 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), | 814 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), |
814 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 815 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index d27d7d777ea..54b4258afb1 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -795,6 +795,13 @@ | |||
795 | #define PI_E861_PID 0x1008 /* E-861 piezo controller USB connection */ | 795 | #define PI_E861_PID 0x1008 /* E-861 piezo controller USB connection */ |
796 | 796 | ||
797 | /* | 797 | /* |
798 | * Kondo Kagaku Co.Ltd. | ||
799 | * http://www.kondo-robot.com/EN | ||
800 | */ | ||
801 | #define KONDO_VID 0x165c | ||
802 | #define KONDO_USB_SERIAL_PID 0x0002 | ||
803 | |||
804 | /* | ||
798 | * Bayer Ascensia Contour blood glucose meter USB-converter cable. | 805 | * Bayer Ascensia Contour blood glucose meter USB-converter cable. |
799 | * http://winglucofacts.com/cables/ | 806 | * http://winglucofacts.com/cables/ |
800 | */ | 807 | */ |