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

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

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

Johan writes:

USB-serial updates for 6.9-rc1

Here are the USB-serial updates for 6.9-rc1, including:

 - new device ids
 - removal of some redundant assignments

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

* tag 'usb-serial-6.9-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
  USB: serial: keyspan: remove redundant assignment to pointer data
  USB: serial: ftdi_sio: remove redundant assignment to variable cflag
  USB: serial: oti6858: remove redundant assignment to variable divisor
  USB: serial: option: add MeiG Smart SLM320 product
  USB: serial: cp210x: add ID for MGP Instruments PDS100
  USB: serial: add device ID for VeriFone adapter
  USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
parents 60055680 b1a8da9f

drivers/usb/serial/cp210x.c

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */

	{ USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */

	{ USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */

	{ USB_DEVICE(0x04BF, 0x1301) }, /* TDK Corporation NC0110013M - Network Controller */

	{ USB_DEVICE(0x04BF, 0x1303) }, /* TDK Corporation MM0110113M - i3 Micro Module */

	{ USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */

	{ USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */

	{ USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
@@ -144,6 +146,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */

	{ USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */

	{ USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */

	{ USB_DEVICE(0x10C4, 0x863C) }, /* MGP Instruments PDS100 */

	{ USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */

	{ USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */

	{ USB_DEVICE(0x10C4, 0x87ED) }, /* IMST USB-Stick for Smart Meter */
@@ -177,6 +180,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */

	{ USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */

	{ USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */

	{ USB_DEVICE(0x11CA, 0x0212) }, /* Verifone USB to Printer (UART, CP2102) */

	{ USB_DEVICE(0x12B8, 0xEC60) }, /* Link G4 ECU */

	{ USB_DEVICE(0x12B8, 0xEC62) }, /* Link G4+ ECU */

	{ USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */

drivers/usb/serial/ftdi_sio.c

+3 −1
Original line number Diff line number Diff line
@@ -1077,6 +1077,8 @@ static const struct usb_device_id id_table_combined[] = { 
		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	/* GMC devices */

	{ USB_DEVICE(GMC_VID, GMC_Z216C_PID) },

	{ }					/* Terminating entry */

};
@@ -2610,7 +2612,7 @@ static void ftdi_set_termios(struct tty_struct *tty, 
	struct device *ddev = &port->dev;

	struct ftdi_private *priv = usb_get_serial_port_data(port);

	struct ktermios *termios = &tty->termios;

	unsigned int cflag = termios->c_cflag;

	unsigned int cflag;

	u16 value, index;

	int ret;

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -1606,3 +1606,9 @@ 
#define UBLOX_VID			0x1546

#define UBLOX_C099F9P_ZED_PID		0x0502

#define UBLOX_C099F9P_ODIN_PID		0x0503



/*

 * GMC devices

 */

#define GMC_VID				0x1cd7

#define GMC_Z216C_PID			0x0217 /* GMC Z216C Adapter IR-USB */

drivers/usb/serial/keyspan.c

+0 −1
Original line number Diff line number Diff line
@@ -921,7 +921,6 @@ static void usa28_indat_callback(struct urb *urb) 


	port =  urb->context;

	p_priv = usb_get_serial_port_data(port);

	data = urb->transfer_buffer;



	if (urb != p_priv->in_urbs[p_priv->in_flip])

		return;

drivers/usb/serial/option.c

+6 −0
Original line number Diff line number Diff line
@@ -613,6 +613,11 @@ static void option_instat_callback(struct urb *urb); 
/* Luat Air72*U series based on UNISOC UIS8910 uses UNISOC's vendor ID */

#define LUAT_PRODUCT_AIR720U			0x4e00



/* MeiG Smart Technology products */

#define MEIGSMART_VENDOR_ID			0x2dee

/* MeiG Smart SLM320 based on UNISOC UIS8910 */

#define MEIGSMART_PRODUCT_SLM320		0x4d41



/* Device flags */



/* Highest interface number which can be used with NCTRL() and RSVD() */
@@ -2282,6 +2287,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SLM320, 0xff, 0, 0) },

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);