Commit 715a654b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-6.1-rc1' of... 

Merge tag 'usb-serial-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:
  "USB-serial updates for 6.1-rc1

   Here are the USB-serial updates for 6.1-rc1, including:
    - a fix for a very long-standing FTDI SIO regression
    - a long-overdue cleanup of the FTDI type handling
    - support for new FTDI HP and HA devices

   Included are also various clean ups.

   All have been in linux-next with no reported issues."

* tag 'usb-serial-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: ftdi_sio: clean up driver prefix
  USB: serial: ftdi_sio: move driver structure
  USB: serial: ftdi_sio: clean up attribute visibility logic
  USB: serial: console: move mutex_unlock() before usb_serial_put()
  USB: serial: ftdi_sio: convert to use dev_groups
  USB: serial: ftdi_sio: add support for HP and HA devices
  USB: serial: ftdi_sio: simplify divisor handling
  USB: serial: ftdi_sio: assume hi-speed type
  USB: serial: ftdi_sio: clean up baudrate request
  USB: serial: ftdi_sio: clean up attribute handling
  USB: serial: ftdi_sio: clean up modem-status handling
  USB: serial: ftdi_sio: tighten device-type detection
  USB: serial: ftdi_sio: rename channel index
  USB: serial: ftdi_sio: include FT2232D in type string
  USB: serial: ftdi_sio: rename chip types
  USB: serial: ftdi_sio: drop redundant chip type comments
  USB: serial: ftdi_sio: clean up chip type enum
  USB: serial: ftdi_sio: fix 300 bps rate for SIO
parents 7eb2bf87 6b2fe3df

drivers/usb/serial/console.c

+1 −1
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ static int usb_console_setup(struct console *co, char *options) 
	info->port = NULL;

	usb_autopm_put_interface(serial->interface);

 error_get_interface:

	usb_serial_put(serial);

	mutex_unlock(&serial->disc_mutex);

	usb_serial_put(serial);

	return retval;

}

drivers/usb/serial/ftdi_sio.c

+232 −253

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/serial/ftdi_sio.h

+5 −17
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ 
#define FTDI_SIO_READ_PINS		0x0c /* Read immediate value of pins */

#define FTDI_SIO_READ_EEPROM		0x90 /* Read EEPROM */



/* Interface indices for FT2232, FT2232H and FT4232H devices */

#define INTERFACE_A		1

#define INTERFACE_B		2

#define INTERFACE_C		3

#define INTERFACE_D		4

/* Channel indices for FT2232, FT2232H and FT4232H devices */

#define CHANNEL_A		1

#define CHANNEL_B		2

#define CHANNEL_C		3

#define CHANNEL_D		4





/*
@@ -153,18 +153,6 @@ 
 * not supported by the FT8U232AM).

 */



enum ftdi_chip_type {

	SIO = 1,

	FT8U232AM = 2,

	FT232BM = 3,

	FT2232C = 4,

	FT232RL = 5,

	FT2232H = 6,

	FT4232H = 7,

	FT232H  = 8,

	FTX     = 9,

};



enum ftdi_sio_baudrate {

	ftdi_sio_b300 = 0,

	ftdi_sio_b600 = 1,

drivers/usb/serial/ftdi_sio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ 
#define FTDI_4232H_PID 0x6011 /* Quad channel hi-speed device */

#define FTDI_232H_PID  0x6014 /* Single channel hi-speed device */

#define FTDI_FTX_PID   0x6015 /* FT-X series (FT201X, FT230X, FT231X, etc) */

#define FTDI_FT2233HP_PID	0x6040 /* Dual channel hi-speed device with PD */

#define FTDI_FT4233HP_PID	0x6041 /* Quad channel hi-speed device with PD */

#define FTDI_FT2232HP_PID	0x6042 /* Dual channel hi-speed device with PD */

#define FTDI_FT4232HP_PID	0x6043 /* Quad channel hi-speed device with PD */

#define FTDI_FT233HP_PID	0x6044 /* Dual channel hi-speed device with PD */

#define FTDI_FT232HP_PID	0x6045 /* Dual channel hi-speed device with PD */

#define FTDI_FT4232HA_PID	0x6048 /* Quad channel automotive grade hi-speed device */

#define FTDI_SIO_PID	0x8372	/* Product Id SIO application of 8U100AX */

#define FTDI_232RL_PID  0xFBFA  /* Product ID for FT232RL */