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

Merge tag 'usb-serial-6.15-rc3' of... 

Merge tag 'usb-serial-6.15-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial device ids for 6.15-rc3

Here's a new simple driver for Owon oscilloscopes and a couple of new
new modem and smart meter device ids.

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

* tag 'usb-serial-6.15-rc3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: simple: add OWON HDS200 series oscilloscope support
  USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
  USB: serial: option: add Sierra Wireless EM9291
parents 429a98ab 4cc01410

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 2) },

	{ USB_DEVICE_INTERFACE_NUMBER(ALTERA_VID, ALTERA_UB3_602E_PID, 3) },

	/* Abacus Electrics */

	{ USB_DEVICE(FTDI_VID, ABACUS_OPTICAL_PROBE_PID) },

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+5 −0
Original line number Diff line number Diff line
@@ -442,6 +442,11 @@ 
#define LINX_FUTURE_1_PID   0xF44B	/* Linx future device */

#define LINX_FUTURE_2_PID   0xF44C	/* Linx future device */



/*

 * Abacus Electrics

 */

#define ABACUS_OPTICAL_PROBE_PID	0xf458 /* ABACUS ELECTRICS Optical Probe */



/*

 * Oceanic product ids

 */

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static void option_instat_callback(struct urb *urb); 
/* Sierra Wireless products */

#define SIERRA_VENDOR_ID			0x1199

#define SIERRA_PRODUCT_EM9191			0x90d3

#define SIERRA_PRODUCT_EM9291			0x90e3



/* UNISOC (Spreadtrum) products */

#define UNISOC_VENDOR_ID			0x1782
@@ -2432,6 +2433,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x40) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x40) },

	{ 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_INTERFACE_CLASS(0x1bbb, 0x0530, 0xff),			/* TCL IK512 MBIM */

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

+7 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ DEVICE(nokia, NOKIA_IDS); 
	{ USB_DEVICE(0x09d7, 0x0100) }	/* NovAtel FlexPack GPS */

DEVICE_N(novatel_gps, NOVATEL_IDS, 3);



/* OWON electronic test and measurement equipment driver */

#define OWON_IDS()			\

	{ USB_DEVICE(0x5345, 0x1234) } /* HDS200 oscilloscopes and others */

DEVICE(owon, OWON_IDS);



/* Siemens USB/MPI adapter */

#define SIEMENS_IDS()			\

	{ USB_DEVICE(0x908, 0x0004) }
@@ -134,6 +139,7 @@ static struct usb_serial_driver * const serial_drivers[] = { 
	&motorola_tetra_device,

	&nokia_device,

	&novatel_gps_device,

	&owon_device,

	&siemens_mpi_device,

	&suunto_device,

	&vivopay_device,
@@ -153,6 +159,7 @@ static const struct usb_device_id id_table[] = { 
	MOTOROLA_TETRA_IDS(),

	NOKIA_IDS(),

	NOVATEL_IDS(),

	OWON_IDS(),

	SIEMENS_IDS(),

	SUUNTO_IDS(),

	VIVOPAY_IDS(),