mirror of https://gitee.com/openkylin/linux.git
USB: ftdi_sio - enabling multiple ELV devices, adding EM1010PC
I work with a group of people on a free home automation tool called FHEM. Some of the users own more than one USB-serial device by ELV. The ftdi_sio driver has most of the ELV devices disabled by default and needs to be re-enabled every time you get a new kernel. Additionally a new device (EM 1010 PC - enegry monitor) is missing in the list. Currently our users have to follow the instructions we provide at http://www.koeniglich.de/fhem/linux.html ... However, to some users it is too complicated to compile their own kernel module. We are aware that you can specify one additional device using the vendor/product option of the module. But lot's of users own more than one device. Cc: stable <stable@kernel.org> Signed-off-by: Peter Stark <peter.stark@t-online.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
da28762372
commit
42f8aa9456
|
@ -471,30 +471,28 @@ static struct usb_device_id id_table_combined [] = {
|
|||
{ USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) },
|
||||
/*
|
||||
* These will probably use user-space drivers. Uncomment them if
|
||||
* you need them or use the user-specified vendor/product module
|
||||
* parameters (see ftdi_sio.h for the numbers). Make a fuss if
|
||||
* you think the driver should recognize any of them by default.
|
||||
* Due to many user requests for multiple ELV devices we enable
|
||||
* them by default.
|
||||
*/
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, */
|
||||
/* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, */
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
|
||||
{ USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },
|
||||
|
|
|
@ -245,6 +245,7 @@
|
|||
#define FTDI_ELV_WS300PC_PID 0xE0F6 /* PC-Wetterstation (WS 300 PC) */
|
||||
#define FTDI_ELV_FHZ1300PC_PID 0xE0E8 /* FHZ 1300 PC */
|
||||
#define FTDI_ELV_WS500_PID 0xE0E9 /* PC-Wetterstation (WS 500) */
|
||||
#define FTDI_ELV_EM1010PC_PID 0xE0EF /* Engery monitor EM 1010 PC */
|
||||
|
||||
/*
|
||||
* Definitions for ID TECH (www.idt-net.com) devices
|
||||
|
|
Loading…
Reference in New Issue