aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.h6
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 76a17f915eef..f0cb7d646d7d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -702,6 +702,8 @@ static struct usb_device_id id_table_combined [] = {
702 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, 702 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
703 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), 703 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
704 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 704 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
705 { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
706 { USB_DEVICE(FTDI_VID, HAMEG_HO870_PID) },
705 { }, /* Optional parameter entry */ 707 { }, /* Optional parameter entry */
706 { } /* Terminating entry */ 708 { } /* Terminating entry */
707}; 709};
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 8c92b88166ae..3c85bfd46729 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -968,6 +968,12 @@
968#define MARVELL_OPENRD_PID 0x9e90 968#define MARVELL_OPENRD_PID 0x9e90
969 969
970/* 970/*
971 * Hameg HO820 and HO870 interface (using VID 0x0403)
972 */
973#define HAMEG_HO820_PID 0xed74
974#define HAMEG_HO870_PID 0xed71
975
976/*
971 * BmRequestType: 1100 0000b 977 * BmRequestType: 1100 0000b
972 * bRequest: FTDI_E2_READ 978 * bRequest: FTDI_E2_READ
973 * wValue: 0 979 * wValue: 0