aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorPeter Stark <Peter.Stark@t-online.de>2007-12-25 12:32:08 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 17:34:44 -0500
commit42f8aa945660b901a3c7f25447aa948bf03f208a (patch)
tree2b038bfa06020a86b530160b71afb93b13481a0e /drivers/usb/serial/ftdi_sio.c
parentda287623723f97939cdae8db44735228de15f3b5 (diff)
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>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c44
1 files changed, 21 insertions, 23 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c40e77dccf8e..0ea28b081c80 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -471,30 +471,28 @@ static struct usb_device_id id_table_combined [] = {
471 { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) }, 471 { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) },
472 { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) }, 472 { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) },
473 /* 473 /*
474 * These will probably use user-space drivers. Uncomment them if 474 * Due to many user requests for multiple ELV devices we enable
475 * you need them or use the user-specified vendor/product module 475 * them by default.
476 * parameters (see ftdi_sio.h for the numbers). Make a fuss if
477 * you think the driver should recognize any of them by default.
478 */ 476 */
479 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) }, */ 477 { USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) },
480 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) }, */ 478 { USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) },
481 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) }, */ 479 { USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) },
482 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) }, */ 480 { USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) },
483 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) }, */ 481 { USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) },
484 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) }, */ 482 { USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) },
485 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) }, */ 483 { USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) },
486 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) }, */ 484 { USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) },
487 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) }, */ 485 { USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) },
488 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) }, */ 486 { USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) },
489 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) }, */ 487 { USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) },
490 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) }, */ 488 { USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) },
491 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) }, */ 489 { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) },
492 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) }, */ 490 { USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) },
493 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) }, */ 491 { USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) },
494 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) }, */ 492 { USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) },
495 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) }, */ 493 { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) },
496 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, */ 494 { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) },
497 /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, */ 495 { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) },
498 { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) }, 496 { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
499 { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) }, 497 { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
500 { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) }, 498 { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },