On Thu, 2004-03-25 at 11:23, Greg KH wrote:
> On Thu, Mar 11, 2004 at 12:03:06PM -0800, Corey Edwards wrote:
> > This patch adds product ids for chips from Linx Technologies
> > (www.linxtechnologies.com). Patches against 2.6.4 and 2.4.25.
>
> Hm, this doesn't apply against my latest tree, sorry. Care to rediff
> against the -mm tree for 2.6 and the latest -pre patch for 2.4?
Here's patches against 2.4.26-pre6 and 2.6.5-rc2-mm3. I'm new to
submitting kernel patches so I hope those are the two trees you meant.
--
Corey Edwards <[EMAIL PROTECTED]>
Linx Technologies
diff -uN -r linux-2.4.26-pre6/drivers/usb/serial/ftdi_sio.c modified-2.4.26-pre6/drivers/usb/serial/ftdi_sio.c
--- linux-2.4.26-pre6/drivers/usb/serial/ftdi_sio.c 2004-03-25 13:18:37.000000000 -0800
+++ modified-2.4.26-pre6/drivers/usb/serial/ftdi_sio.c 2004-03-25 13:23:43.000000000 -0800
@@ -428,6 +428,11 @@
{ USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_3, 0x400, 0xffff) },
{ USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_4, 0x400, 0xffff) },
{ USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_1_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_2_PID, 0x400, 0xffff) },
{ } /* Terminating entry */
};
@@ -526,6 +531,11 @@
{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_3) },
{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_4) },
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UO100_PID) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_1_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_2_PID, 0x400, 0xffff) },
{ } /* Terminating entry */
};
diff -uN -r linux-2.4.26-pre6/drivers/usb/serial/ftdi_sio.h modified-2.4.26-pre6/drivers/usb/serial/ftdi_sio.h
--- linux-2.4.26-pre6/drivers/usb/serial/ftdi_sio.h 2004-03-25 13:18:37.000000000 -0800
+++ modified-2.4.26-pre6/drivers/usb/serial/ftdi_sio.h 2004-03-25 13:19:57.000000000 -0800
@@ -165,6 +165,15 @@
#define PROTEGO_SPECIAL_3 0xFC72 /* special/unknown device */
#define PROTEGO_SPECIAL_4 0xFC73 /* special/unknown device */
+/*
+ * Linx Technologies product ids
+ */
+#define LINX_SDMUSBQSS_PID 0xF448 /* Linx SDM-USB-QS-S */
+#define LINX_MASTERDEVEL2_PID 0xF449 /* Linx Master Development 2.0 */
+#define LINX_FUTURE_0_PID 0xF44A /* Linx future device */
+#define LINX_FUTURE_1_PID 0xF44B /* Linx future device */
+#define LINX_FUTURE_2_PID 0xF44C /* Linx future device */
+
/* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */
#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
diff -uN -r linux-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.c modified-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.c 2004-03-25 12:22:57.000000000 -0800
+++ modified-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.c 2004-03-25 12:24:55.000000000 -0800
@@ -436,6 +436,11 @@
{ USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_3, 0x400, 0xffff) },
{ USB_DEVICE_VER(FTDI_VID, PROTEGO_SPECIAL_4, 0x400, 0xffff) },
{ USB_DEVICE_VER(FTDI_VID, FTDI_ELV_UO100_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_1_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_2_PID, 0x400, 0xffff) },
{ } /* Terminating entry */
};
@@ -532,6 +537,11 @@
{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_3) },
{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_4) },
{ USB_DEVICE(FTDI_VID, FTDI_ELV_UO100_PID) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_0_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_1_PID, 0x400, 0xffff) },
+ { USB_DEVICE_VER(FTDI_VID, LINX_FUTURE_2_PID, 0x400, 0xffff) },
{ } /* Terminating entry */
};
diff -uN -r linux-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.h modified-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.h 2004-03-25 12:22:57.000000000 -0800
+++ modified-2.6.5-rc2-mm3/drivers/usb/serial/ftdi_sio.h 2004-03-25 12:24:55.000000000 -0800
@@ -162,6 +162,15 @@
#define PROTEGO_SPECIAL_3 0xFC72 /* special/unknown device */
#define PROTEGO_SPECIAL_4 0xFC73 /* special/unknown device */
+/*
+ * Linx Technologies product ids
+ */
+#define LINX_SDMUSBQSS_PID 0xF448 /* Linx SDM-USB-QS-S */
+#define LINX_MASTERDEVEL2_PID 0xF449 /* Linx Master Development 2.0 */
+#define LINX_FUTURE_0_PID 0xF44A /* Linx future device */
+#define LINX_FUTURE_1_PID 0xF44B /* Linx future device */
+#define LINX_FUTURE_2_PID 0xF44C /* Linx future device */
+
/* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */
#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
