On Sat, Aug 16, 2014 at 12:44:27PM +0200, Jaša Bartelj wrote:
> Added support to the ftdi_sio driver for ekey Converter USB which
> uses an FT232BM chip.
> 
> Signed-off-by: Jaša Bartelj <[email protected]>

Applied, thanks.

Johan

> ---
>  drivers/usb/serial/ftdi_sio.c     | 2 ++
>  drivers/usb/serial/ftdi_sio_ids.h | 5 +++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index 216ce30..19cf267 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -934,6 +934,8 @@ static const struct usb_device_id id_table_combined[] = {
>       { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
>       { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
>       { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
> +     /* ekey Devices */
> +     { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },
>       /* Infineon Devices */
>       { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) },
>       { }                                     /* Terminating entry */
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h 
> b/drivers/usb/serial/ftdi_sio_ids.h
> index 1e58d90..f585eb7 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -1378,3 +1378,8 @@
>  #define BRAINBOXES_US_160_6_PID              0x9006 /* US-160 16xRS232 
> 1Mbaud Port 11 and 12 */
>  #define BRAINBOXES_US_160_7_PID              0x9007 /* US-160 16xRS232 
> 1Mbaud Port 13 and 14 */
>  #define BRAINBOXES_US_160_8_PID              0x9008 /* US-160 16xRS232 
> 1Mbaud Port 15 and 16 */
> +
> +/*
> + * ekey biometric systems GmbH (http://ekey.net/)
> + */
> +#define FTDI_EKEY_CONV_USB_PID               0xCB08 /* Converter USB */
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to