mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
bb34e69f3d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
149 lines
5.0 KiB
Diff
149 lines
5.0 KiB
Diff
From 7121306391cac4f482edc239e2c8b0f8ac310f92 Mon Sep 17 00:00:00 2001
|
|
From: Donald Lee <donald@asix.com.tw>
|
|
Date: Wed, 14 Mar 2012 15:26:33 +0800
|
|
Subject: [PATCH 034/147] USB: serial: mos7840: Fixed MCS7820 device attach
|
|
problem
|
|
|
|
commit 093ea2d3a766cb8a4c4de57efec6c0a127a58792 upstream.
|
|
|
|
A MCS7820 device supports two serial ports and a MCS7840 device supports
|
|
four serial ports. Both devices use the same driver, but the attach function
|
|
in driver was unable to correctly handle the port numbers for MCS7820
|
|
device. This problem has been fixed in this patch and this fix has been
|
|
verified on x86 Linux kernel 3.2.9 with both MCS7820 and MCS7840 devices.
|
|
|
|
Signed-off-by: Donald Lee <donald@asix.com.tw>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/usb/serial/mos7840.c | 83 +++++++++++++++++++++++++++++-------------
|
|
1 file changed, 57 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
|
|
index c72abd5..5c7d654 100644
|
|
--- a/drivers/usb/serial/mos7840.c
|
|
+++ b/drivers/usb/serial/mos7840.c
|
|
@@ -174,6 +174,7 @@
|
|
|
|
#define CLK_MULTI_REGISTER ((__u16)(0x02))
|
|
#define CLK_START_VALUE_REGISTER ((__u16)(0x03))
|
|
+#define GPIO_REGISTER ((__u16)(0x07))
|
|
|
|
#define SERIAL_LCR_DLAB ((__u16)(0x0080))
|
|
|
|
@@ -1103,14 +1104,25 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|
mos7840_port->read_urb = port->read_urb;
|
|
|
|
/* set up our bulk in urb */
|
|
-
|
|
- usb_fill_bulk_urb(mos7840_port->read_urb,
|
|
- serial->dev,
|
|
- usb_rcvbulkpipe(serial->dev,
|
|
- port->bulk_in_endpointAddress),
|
|
- port->bulk_in_buffer,
|
|
- mos7840_port->read_urb->transfer_buffer_length,
|
|
- mos7840_bulk_in_callback, mos7840_port);
|
|
+ if ((serial->num_ports == 2)
|
|
+ && ((((__u16)port->number -
|
|
+ (__u16)(port->serial->minor)) % 2) != 0)) {
|
|
+ usb_fill_bulk_urb(mos7840_port->read_urb,
|
|
+ serial->dev,
|
|
+ usb_rcvbulkpipe(serial->dev,
|
|
+ (port->bulk_in_endpointAddress) + 2),
|
|
+ port->bulk_in_buffer,
|
|
+ mos7840_port->read_urb->transfer_buffer_length,
|
|
+ mos7840_bulk_in_callback, mos7840_port);
|
|
+ } else {
|
|
+ usb_fill_bulk_urb(mos7840_port->read_urb,
|
|
+ serial->dev,
|
|
+ usb_rcvbulkpipe(serial->dev,
|
|
+ port->bulk_in_endpointAddress),
|
|
+ port->bulk_in_buffer,
|
|
+ mos7840_port->read_urb->transfer_buffer_length,
|
|
+ mos7840_bulk_in_callback, mos7840_port);
|
|
+ }
|
|
|
|
dbg("mos7840_open: bulkin endpoint is %d",
|
|
port->bulk_in_endpointAddress);
|
|
@@ -1521,13 +1533,25 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
|
|
memcpy(urb->transfer_buffer, current_position, transfer_size);
|
|
|
|
/* fill urb with data and submit */
|
|
- usb_fill_bulk_urb(urb,
|
|
- serial->dev,
|
|
- usb_sndbulkpipe(serial->dev,
|
|
- port->bulk_out_endpointAddress),
|
|
- urb->transfer_buffer,
|
|
- transfer_size,
|
|
- mos7840_bulk_out_data_callback, mos7840_port);
|
|
+ if ((serial->num_ports == 2)
|
|
+ && ((((__u16)port->number -
|
|
+ (__u16)(port->serial->minor)) % 2) != 0)) {
|
|
+ usb_fill_bulk_urb(urb,
|
|
+ serial->dev,
|
|
+ usb_sndbulkpipe(serial->dev,
|
|
+ (port->bulk_out_endpointAddress) + 2),
|
|
+ urb->transfer_buffer,
|
|
+ transfer_size,
|
|
+ mos7840_bulk_out_data_callback, mos7840_port);
|
|
+ } else {
|
|
+ usb_fill_bulk_urb(urb,
|
|
+ serial->dev,
|
|
+ usb_sndbulkpipe(serial->dev,
|
|
+ port->bulk_out_endpointAddress),
|
|
+ urb->transfer_buffer,
|
|
+ transfer_size,
|
|
+ mos7840_bulk_out_data_callback, mos7840_port);
|
|
+ }
|
|
|
|
data1 = urb->transfer_buffer;
|
|
dbg("bulkout endpoint is %d", port->bulk_out_endpointAddress);
|
|
@@ -1840,7 +1864,7 @@ static int mos7840_send_cmd_write_baud_rate(struct moschip_port *mos7840_port,
|
|
|
|
} else {
|
|
#ifdef HW_flow_control
|
|
- / *setting h/w flow control bit to 0 */
|
|
+ /* setting h/w flow control bit to 0 */
|
|
Data = 0xb;
|
|
mos7840_port->shadowMCR = Data;
|
|
status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER,
|
|
@@ -2309,19 +2333,26 @@ static int mos7840_ioctl(struct tty_struct *tty,
|
|
|
|
static int mos7840_calc_num_ports(struct usb_serial *serial)
|
|
{
|
|
- int mos7840_num_ports = 0;
|
|
-
|
|
- dbg("numberofendpoints: cur %d, alt %d",
|
|
- (int)serial->interface->cur_altsetting->desc.bNumEndpoints,
|
|
- (int)serial->interface->altsetting->desc.bNumEndpoints);
|
|
- if (serial->interface->cur_altsetting->desc.bNumEndpoints == 5) {
|
|
- mos7840_num_ports = serial->num_ports = 2;
|
|
- } else if (serial->interface->cur_altsetting->desc.bNumEndpoints == 9) {
|
|
+ __u16 Data = 0x00;
|
|
+ int ret = 0;
|
|
+ int mos7840_num_ports;
|
|
+
|
|
+ ret = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
|
|
+ MCS_RDREQ, MCS_RD_RTYPE, 0, GPIO_REGISTER, &Data,
|
|
+ VENDOR_READ_LENGTH, MOS_WDR_TIMEOUT);
|
|
+
|
|
+ if ((Data & 0x01) == 0) {
|
|
+ mos7840_num_ports = 2;
|
|
+ serial->num_bulk_in = 2;
|
|
+ serial->num_bulk_out = 2;
|
|
+ serial->num_ports = 2;
|
|
+ } else {
|
|
+ mos7840_num_ports = 4;
|
|
serial->num_bulk_in = 4;
|
|
serial->num_bulk_out = 4;
|
|
- mos7840_num_ports = serial->num_ports = 4;
|
|
+ serial->num_ports = 4;
|
|
}
|
|
- dbg ("mos7840_num_ports = %d", mos7840_num_ports);
|
|
+
|
|
return mos7840_num_ports;
|
|
}
|
|
|
|
--
|
|
1.7.9.4
|
|
|