diff options
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 17 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 20 | 
2 files changed, 37 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 1ebb351b9e9a..651dc1ba46c3 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c  | |||
| @@ -978,6 +978,23 @@ static const struct usb_device_id id_table_combined[] = { | |||
| 978 | { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) }, | 978 | { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) }, | 
| 979 | /* GE Healthcare devices */ | 979 | /* GE Healthcare devices */ | 
| 980 | { USB_DEVICE(GE_HEALTHCARE_VID, GE_HEALTHCARE_NEMO_TRACKER_PID) }, | 980 | { USB_DEVICE(GE_HEALTHCARE_VID, GE_HEALTHCARE_NEMO_TRACKER_PID) }, | 
| 981 | /* Active Research (Actisense) devices */ | ||
| 982 | { USB_DEVICE(FTDI_VID, ACTISENSE_NDC_PID) }, | ||
| 983 | { USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) }, | ||
| 984 | { USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) }, | ||
| 985 | { USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) }, | ||
| 986 | { USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) }, | ||
| 987 | { USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) }, | ||
| 988 | { USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) }, | ||
| 989 | { USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) }, | ||
| 990 | { USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) }, | ||
| 991 | { USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) }, | ||
| 992 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_NMEA2000_PID) }, | ||
| 993 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ETHERNET_PID) }, | ||
| 994 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_WIFI_PID) }, | ||
| 995 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_DISPLAY_PID) }, | ||
| 996 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_LITE_PID) }, | ||
| 997 | { USB_DEVICE(FTDI_VID, CHETCO_SEASMART_ANALOG_PID) }, | ||
| 981 | { } /* Terminating entry */ | 998 | { } /* Terminating entry */ | 
| 982 | }; | 999 | }; | 
| 983 | 1000 | ||
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index e52409c9be99..4d3da89cd8dd 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h  | |||
| @@ -1438,3 +1438,23 @@ | |||
| 1438 | */ | 1438 | */ | 
| 1439 | #define GE_HEALTHCARE_VID 0x1901 | 1439 | #define GE_HEALTHCARE_VID 0x1901 | 
| 1440 | #define GE_HEALTHCARE_NEMO_TRACKER_PID 0x0015 | 1440 | #define GE_HEALTHCARE_NEMO_TRACKER_PID 0x0015 | 
| 1441 | |||
| 1442 | /* | ||
| 1443 | * Active Research (Actisense) devices | ||
| 1444 | */ | ||
| 1445 | #define ACTISENSE_NDC_PID 0xD9A8 /* NDC USB Serial Adapter */ | ||
| 1446 | #define ACTISENSE_USG_PID 0xD9A9 /* USG USB Serial Adapter */ | ||
| 1447 | #define ACTISENSE_NGT_PID 0xD9AA /* NGT NMEA2000 Interface */ | ||
| 1448 | #define ACTISENSE_NGW_PID 0xD9AB /* NGW NMEA2000 Gateway */ | ||
| 1449 | #define ACTISENSE_D9AC_PID 0xD9AC /* Actisense Reserved */ | ||
| 1450 | #define ACTISENSE_D9AD_PID 0xD9AD /* Actisense Reserved */ | ||
| 1451 | #define ACTISENSE_D9AE_PID 0xD9AE /* Actisense Reserved */ | ||
| 1452 | #define ACTISENSE_D9AF_PID 0xD9AF /* Actisense Reserved */ | ||
| 1453 | #define CHETCO_SEAGAUGE_PID 0xA548 /* SeaGauge USB Adapter */ | ||
| 1454 | #define CHETCO_SEASWITCH_PID 0xA549 /* SeaSwitch USB Adapter */ | ||
| 1455 | #define CHETCO_SEASMART_NMEA2000_PID 0xA54A /* SeaSmart NMEA2000 Gateway */ | ||
| 1456 | #define CHETCO_SEASMART_ETHERNET_PID 0xA54B /* SeaSmart Ethernet Gateway */ | ||
| 1457 | #define CHETCO_SEASMART_WIFI_PID 0xA5AC /* SeaSmart Wifi Gateway */ | ||
| 1458 | #define CHETCO_SEASMART_DISPLAY_PID 0xA5AD /* SeaSmart NMEA2000 Display */ | ||
| 1459 | #define CHETCO_SEASMART_LITE_PID 0xA5AE /* SeaSmart Lite USB Adapter */ | ||
| 1460 | #define CHETCO_SEASMART_ANALOG_PID 0xA5AF /* SeaSmart Analog Adapter */ | ||
