mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

USB: serial: ftdi_sio: clean up baudrate request

Browse source 
Multi-channel devices need to encode the channel selector in their
control requests and newer single-channel chip types use the same
request format.

Set the channel index also for these single-channel types so that the
index can be used to determine the baudrate request format instead of
listing types explicitly.

Note that FT232H and FTX accept either 0 or 1 as selector for their
single channel, presumably for backward compatibility reasons.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2022-09-11 16:02:13 +02:00
parent 4d045b98fb
commit a146cc4d46
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/serial/ftdi_sio.c
View file

@ -1406,13 +1406,8 @@ static int change_speed(struct tty_struct *tty, struct usb_serial_port *port)
index_value = get_ftdi_divisor(tty, port);
value = (u16)index_value;
index = (u16)(index_value >> 16);
if (priv->chip_type == FT2232C || priv->chip_type == FT2232H ||
priv->chip_type == FT4232H || priv->chip_type == FT232H ||
priv->chip_type == FTX) {
/* Probably the BM type needs the MSB of the encoded fractional
* divider also moved like for the chips above. Any infos? */
if (priv->channel)
index = (u16)((index << 8) | priv->channel);
}
rv = usb_control_msg(port->serial->dev,
usb_sndctrlpipe(port->serial->dev, 0),
@ -1595,10 +1590,12 @@ static int ftdi_determine_type(struct usb_serial_port *port)
break;
case 0x900:
priv->chip_type = FT232H;
priv->channel = CHANNEL_A + ifnum;
priv->baud_base = 120000000 / 2;
break;
case 0x1000:
priv->chip_type = FTX;
priv->channel = CHANNEL_A + ifnum;
break;
default:
if (version < 0x200) {