aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/ftdi_sio.c1
-rw-r--r--drivers/usb/serial/ftdi_sio.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 95a1805b064f..9200edc8f0fd 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -525,6 +525,7 @@ static struct usb_device_id id_table_combined [] = {
525 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13U_PID) }, 525 { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13U_PID) },
526 { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) }, 526 { USB_DEVICE(ELEKTOR_VID, ELEKTOR_FT323R_PID) },
527 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, 527 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
528 { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
528 { }, /* Optional parameter entry */ 529 { }, /* Optional parameter entry */
529 { } /* Terminating entry */ 530 { } /* Terminating entry */
530}; 531};
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 77ad0a09b384..c85c1fae0cb8 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -518,6 +518,11 @@
518#define FTDI_IBS_PEDO_PID 0xff3e /* IBS PEDO-Modem (RF modem 868.35 MHz) */ 518#define FTDI_IBS_PEDO_PID 0xff3e /* IBS PEDO-Modem (RF modem 868.35 MHz) */
519#define FTDI_IBS_PROD_PID 0xff3f /* future device */ 519#define FTDI_IBS_PROD_PID 0xff3f /* future device */
520 520
521/*
522 * MaxStream devices www.maxstream.net
523 */
524#define FTDI_MAXSTREAM_PID 0xEE18 /* Xbee PKG-U Module */
525
521/* Commands */ 526/* Commands */
522#define FTDI_SIO_RESET 0 /* Reset the port */ 527#define FTDI_SIO_RESET 0 /* Reset the port */
523#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ 528#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */