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

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

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

Johan writes:

USB-serial updates for 5.18-rc1

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

 - a new "simple driver" for some Nokia phones
 - a fix for pl2303 GS type detection
 - another pl2303 device id

Included is also a clean up.

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

* tag 'usb-serial-5.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: usb_wwan: remove redundant assignment to variable i
  USB: serial: pl2303: fix GS type detection
  USB: serial: pl2303: add IBM device IDs
  USB: serial: simple: add Nokia phone driver
parents 98d107b8 4ac56b1f

drivers/usb/serial/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ config USB_SERIAL_SIMPLE 
		- Libtransistor USB console

		- a number of Motorola phones

		- Motorola Tetra devices

		- Nokia mobile phones

		- Novatel Wireless GPS receivers

		- Siemens USB/MPI adapter.

		- ViVOtech ViVOpay USB device.

drivers/usb/serial/pl2303.c

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) },

	{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },

	{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },

	{ USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) },

	{ }					/* Terminating entry */

};
@@ -435,6 +436,7 @@ static int pl2303_detect_type(struct usb_serial *serial) 
		case 0x105:

		case 0x305:

		case 0x405:

		case 0x605:

			/*

			 * Assume it's an HXN-type if the device doesn't

			 * support the old read request value.

drivers/usb/serial/pl2303.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
#define ATEN_PRODUCT_UC232B	0x2022

#define ATEN_PRODUCT_ID2	0x2118



#define IBM_VENDOR_ID		0x04b3

#define IBM_PRODUCT_ID		0x4016



#define IODATA_VENDOR_ID	0x04bb

#define IODATA_PRODUCT_ID	0x0a03

#define IODATA_PRODUCT_ID_RSAQ5	0x0a0e

drivers/usb/serial/usb-serial-simple.c

+7 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ DEVICE(moto_modem, MOTO_IDS); 
	{ USB_DEVICE(0x0cad, 0x9016) }	/* TPG2200 */

DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS);



/* Nokia mobile phone driver */

#define NOKIA_IDS()			\

	{ USB_DEVICE(0x0421, 0x069a) }	/* Nokia 130 (RM-1035) */

DEVICE(nokia, NOKIA_IDS);



/* Novatel Wireless GPS driver */

#define NOVATEL_IDS()			\

	{ USB_DEVICE(0x09d7, 0x0100) }	/* NovAtel FlexPack GPS */
@@ -123,6 +128,7 @@ static struct usb_serial_driver * const serial_drivers[] = { 
	&vivopay_device,

	&moto_modem_device,

	&motorola_tetra_device,

	&nokia_device,

	&novatel_gps_device,

	&hp4x_device,

	&suunto_device,
@@ -140,6 +146,7 @@ static const struct usb_device_id id_table[] = { 
	VIVOPAY_IDS(),

	MOTO_IDS(),

	MOTOROLA_TETRA_IDS(),

	NOKIA_IDS(),

	NOVATEL_IDS(),

	HP4X_IDS(),

	SUUNTO_IDS(),

drivers/usb/serial/usb_wwan.c

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, 


	dev_dbg(&port->dev, "%s: write (%d chars)\n", __func__, count);



	i = 0;

	left = count;

	for (i = 0; left > 0 && i < N_OUT_URB; i++) {

		todo = left;