aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-09-16 09:23:50 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-09-16 09:23:50 -0700
commit8f052ea64c032f5fba8e55974074edf68f8fc08f (patch)
treedbeda36af00a3f0e60dfab1404669d50a9d42580
parent705af30005886801aa23f8527b00d7de46eab140 (diff)
downloadpatches-8f052ea64c032f5fba8e55974074edf68f8fc08f.tar.gz
another usb id
Diffstat
-rw-r--r--series4
-rw-r--r--usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch39
-rw-r--r--usb/usb-ftdi_sio-fix-product-parameter-description.patch2
-rw-r--r--usb/usb-remove-info-macro-from-usb.h.patch8
-rw-r--r--usb/usb-remove-use-of-err-in-drivers-usb-serial.patch40
5 files changed, 67 insertions, 26 deletions
diff --git a/series b/series
index 67cd2e8517a0fe..c1ca124de4e064 100644
--- a/series
+++ b/series
@@ -32,7 +32,7 @@ usb.current/usb-serial-cp2101-add-device-ids.patch
usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch
usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch
usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch
-
+usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch
usb.current/usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch
usb.current/usb-add-usb-test-and-measurement-class-driver.patch
@@ -207,3 +207,5 @@ usb/usb-gotemp.patch
#f.patch
+
+
diff --git a/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch b/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch
new file mode 100644
index 00000000000000..cbf7b4eaf1d06a
--- /dev/null
+++ b/usb.current/usb-ftdi_sio-add-0x5050-0x0900-usb-ids.patch
@@ -0,0 +1,39 @@
+From linux-usb-owner@vger.kernel.org Tue Sep 16 09:19:18 2008
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 16 Sep 2008 15:46:50 +0200 (CEST)
+Subject: USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
+To: linux-usb@vger.kernel.org
+Message-ID: <Pine.LNX.4.61.0809161544140.10962@tm8103-a.perex-int.cz>
+
+From: Jaroslav Kysela <perex@perex.cz>
+
+USB: ftdi_sio: Add 0x5050/0x0900 USB IDs (Papouch Quido USB 4/4)
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -654,6 +654,7 @@ static struct usb_device_id id_table_com
+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
+ { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
++ { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
+ { }, /* Optional parameter entry */
+ { } /* Terminating entry */
+ };
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -750,6 +750,7 @@
+
+ #define PAPOUCH_VID 0x5050 /* Vendor ID */
+ #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */
++#define PAPOUCH_QUIDO4x4_PID 0x0900 /* Quido 4/4 Module */
+
+ /*
+ * ACG Identification Technologies GmbH products (http://www.acg.de/).
diff --git a/usb/usb-ftdi_sio-fix-product-parameter-description.patch b/usb/usb-ftdi_sio-fix-product-parameter-description.patch
index cf1b630e7d1434..db593163e957dc 100644
--- a/usb/usb-ftdi_sio-fix-product-parameter-description.patch
+++ b/usb/usb-ftdi_sio-fix-product-parameter-description.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -2452,5 +2452,5 @@ module_param(vendor, ushort, 0);
+@@ -2453,5 +2453,5 @@ module_param(vendor, ushort, 0);
MODULE_PARM_DESC(vendor, "User specified vendor ID (default="
__MODULE_STRING(FTDI_VID)")");
module_param(product, ushort, 0);
diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch
index 0b262269792877..d02e8e47f95110 100644
--- a/usb/usb-remove-info-macro-from-usb.h.patch
+++ b/usb/usb-remove-info-macro-from-usb.h.patch
@@ -2422,7 +2422,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
failed_usb_register:
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -1150,7 +1150,7 @@ static void ftdi_determine_type(struct u
+@@ -1151,7 +1151,7 @@ static void ftdi_determine_type(struct u
/* Assume its an FT232R */
priv->chip_type = FT232RL;
}
@@ -2431,7 +2431,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
-@@ -1406,7 +1406,8 @@ static int ftdi_jtag_probe(struct usb_se
+@@ -1407,7 +1407,8 @@ static int ftdi_jtag_probe(struct usb_se
dbg("%s", __func__);
if (interface == udev->actconfig->interface[0]) {
@@ -2441,7 +2441,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return -ENODEV;
}
-@@ -1424,7 +1425,8 @@ static int ftdi_mtxorb_hack_setup(struct
+@@ -1425,7 +1426,8 @@ static int ftdi_mtxorb_hack_setup(struct
if (ep->enabled && ep_desc->wMaxPacketSize == 0) {
ep_desc->wMaxPacketSize = cpu_to_le16(0x40);
@@ -2451,7 +2451,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
return 0;
-@@ -2419,7 +2421,8 @@ static int __init ftdi_init(void)
+@@ -2420,7 +2422,8 @@ static int __init ftdi_init(void)
if (retval)
goto failed_usb_register;
diff --git a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
index dfc222b701ce90..5e74a4cfac81a0 100644
--- a/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
+++ b/usb/usb-remove-use-of-err-in-drivers-usb-serial.patch
@@ -528,7 +528,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
-@@ -857,7 +857,8 @@ static int update_mctrl(struct usb_seria
+@@ -858,7 +858,8 @@ static int update_mctrl(struct usb_seria
kfree(buf);
if (rv < 0) {
@@ -538,7 +538,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
__func__,
(set & TIOCM_DTR) ? "HIGH" :
(clear & TIOCM_DTR) ? "LOW" : "unchanged",
-@@ -1323,7 +1324,7 @@ static int ftdi_sio_port_probe(struct us
+@@ -1324,7 +1325,7 @@ static int ftdi_sio_port_probe(struct us
priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
if (!priv) {
@@ -547,7 +547,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sizeof(struct ftdi_private));
return -ENOMEM;
}
-@@ -1520,8 +1521,9 @@ static int ftdi_open(struct tty_struct *
+@@ -1521,8 +1522,9 @@ static int ftdi_open(struct tty_struct *
ftdi_read_bulk_callback, port);
result = usb_submit_urb(port->read_urb, GFP_KERNEL);
if (result)
@@ -559,7 +559,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return result;
-@@ -1555,7 +1557,7 @@ static void ftdi_close(struct tty_struct
+@@ -1556,7 +1558,7 @@ static void ftdi_close(struct tty_struct
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface, buf, 0,
WDR_TIMEOUT) < 0) {
@@ -568,7 +568,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
/* drop RTS and DTR */
-@@ -1620,14 +1622,15 @@ static int ftdi_write(struct tty_struct
+@@ -1621,14 +1623,15 @@ static int ftdi_write(struct tty_struct
buffer = kmalloc(transfer_size, GFP_ATOMIC);
if (!buffer) {
@@ -586,7 +586,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
count = -ENOMEM;
goto error_no_urb;
}
-@@ -1671,8 +1674,9 @@ static int ftdi_write(struct tty_struct
+@@ -1672,8 +1675,9 @@ static int ftdi_write(struct tty_struct
status = usb_submit_urb(urb, GFP_ATOMIC);
if (status) {
@@ -598,7 +598,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
count = status;
goto error;
} else {
-@@ -1779,7 +1783,8 @@ static int ftdi_chars_in_buffer(struct t
+@@ -1780,7 +1784,8 @@ static int ftdi_chars_in_buffer(struct t
buffered = (int)priv->tx_outstanding_bytes;
spin_unlock_irqrestore(&priv->tx_lock, flags);
if (buffered < 0) {
@@ -608,7 +608,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
buffered = 0;
}
return buffered;
-@@ -1795,11 +1800,12 @@ static void ftdi_read_bulk_callback(stru
+@@ -1796,11 +1801,12 @@ static void ftdi_read_bulk_callback(stru
int status = urb->status;
if (urb->number_of_packets > 0) {
@@ -626,7 +626,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
dbg("%s - port %d", __func__, port->number);
-@@ -1820,7 +1826,7 @@ static void ftdi_read_bulk_callback(stru
+@@ -1821,7 +1827,7 @@ static void ftdi_read_bulk_callback(stru
}
if (urb != port->read_urb)
@@ -635,7 +635,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (status) {
/* This will happen at close every time so it is a dbg not an
-@@ -1922,7 +1928,8 @@ static void ftdi_process_read(struct wor
+@@ -1923,7 +1929,8 @@ static void ftdi_process_read(struct wor
length = min(PKTSZ, urb->actual_length-packet_offset)-2;
if (length < 0) {
@@ -645,7 +645,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
length = 0;
}
-@@ -2037,8 +2044,9 @@ static void ftdi_process_read(struct wor
+@@ -2038,8 +2045,9 @@ static void ftdi_process_read(struct wor
result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
if (result)
@@ -657,7 +657,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} /* ftdi_process_read */
-@@ -2065,8 +2073,8 @@ static void ftdi_break_ctl(struct tty_st
+@@ -2066,8 +2074,8 @@ static void ftdi_break_ctl(struct tty_st
FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -668,7 +668,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
dbg("%s break state is %d - urb is %d", __func__,
-@@ -2138,7 +2146,7 @@ static void ftdi_set_termios(struct tty_
+@@ -2139,7 +2147,7 @@ static void ftdi_set_termios(struct tty_
case CS7: urb_value |= 7; dbg("Setting CS7"); break;
case CS8: urb_value |= 8; dbg("Setting CS8"); break;
default:
@@ -677,7 +677,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -2151,7 +2159,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2152,7 +2160,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_DATA_REQUEST_TYPE,
urb_value , priv->interface,
buf, 0, WDR_SHORT_TIMEOUT) < 0) {
@@ -687,7 +687,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
/* Now do the baudrate */
-@@ -2162,14 +2171,17 @@ static void ftdi_set_termios(struct tty_
+@@ -2163,14 +2172,17 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -707,7 +707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Ensure RTS and DTR are raised when baudrate changed from 0 */
if (!old_termios || (old_termios->c_cflag & CBAUD) == B0)
set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
-@@ -2185,7 +2197,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2186,7 +2198,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0 , (FTDI_SIO_RTS_CTS_HS | priv->interface),
buf, 0, WDR_TIMEOUT) < 0) {
@@ -717,7 +717,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} else {
-@@ -2216,7 +2229,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2217,7 +2230,8 @@ static void ftdi_set_termios(struct tty_
urb_value , (FTDI_SIO_XON_XOFF_HS
| priv->interface),
buf, 0, WDR_TIMEOUT) < 0) {
@@ -727,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
} else {
/* else clause to only run if cflag ! CRTSCTS and iflag
-@@ -2229,7 +2243,8 @@ static void ftdi_set_termios(struct tty_
+@@ -2230,7 +2244,8 @@ static void ftdi_set_termios(struct tty_
FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
0, priv->interface,
buf, 0, WDR_TIMEOUT) < 0) {
@@ -737,7 +737,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -2255,8 +2270,8 @@ static int ftdi_tiocmget(struct tty_stru
+@@ -2256,8 +2271,8 @@ static int ftdi_tiocmget(struct tty_stru
0, 0,
buf, 1, WDR_TIMEOUT);
if (ret < 0) {
@@ -748,7 +748,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return ret;
}
break;
-@@ -2274,8 +2289,8 @@ static int ftdi_tiocmget(struct tty_stru
+@@ -2275,8 +2290,8 @@ static int ftdi_tiocmget(struct tty_stru
0, priv->interface,
buf, 2, WDR_TIMEOUT);
if (ret < 0) {
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:11:32 +0000