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

Merge tag 'usb-serial-6.7-rc6' of... 

Merge tag 'usb-serial-6.7-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial device ids for 6.7-rc6

Here are some new modem device ids and a rename of a few ftdi product id
defines.

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

* tag 'usb-serial-6.7-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Quectel EG912Y module support
  USB: serial: ftdi_sio: update Actisense PIDs constant names
  USB: serial: option: add Quectel RM500Q R13 firmware support
  USB: serial: option: add Foxconn T99W265 with new baseline
parents 7fbcd195 6d79d943

drivers/usb/serial/ftdi_sio.c

+3 −3
Original line number Diff line number Diff line
@@ -1033,9 +1033,9 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) },

	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) },

	{ USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) },

	{ USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+3 −3
Original line number Diff line number Diff line
@@ -1568,9 +1568,9 @@ 
#define ACTISENSE_USG_PID		0xD9A9 /* USG USB Serial Adapter */

#define ACTISENSE_NGT_PID		0xD9AA /* NGT NMEA2000 Interface */

#define ACTISENSE_NGW_PID		0xD9AB /* NGW NMEA2000 Gateway */

#define ACTISENSE_D9AC_PID		0xD9AC /* Actisense Reserved */

#define ACTISENSE_D9AD_PID		0xD9AD /* Actisense Reserved */

#define ACTISENSE_D9AE_PID		0xD9AE /* Actisense Reserved */

#define ACTISENSE_UID_PID		0xD9AC /* USB Isolating Device */

#define ACTISENSE_USA_PID		0xD9AD /* USB to Serial Adapter */

#define ACTISENSE_NGX_PID		0xD9AE /* NGX NMEA2000 Gateway */

#define ACTISENSE_D9AF_PID		0xD9AF /* Actisense Reserved */

#define CHETCO_SEAGAUGE_PID		0xA548 /* SeaGauge USB Adapter */

#define CHETCO_SEASWITCH_PID		0xA549 /* SeaSwitch USB Adapter */

drivers/usb/serial/option.c

+5 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ static void option_instat_callback(struct urb *urb); 
#define QUECTEL_PRODUCT_RM500Q			0x0800

#define QUECTEL_PRODUCT_RM520N			0x0801

#define QUECTEL_PRODUCT_EC200U			0x0901

#define QUECTEL_PRODUCT_EG912Y			0x6001

#define QUECTEL_PRODUCT_EC200S_CN		0x6002

#define QUECTEL_PRODUCT_EC200A			0x6005

#define QUECTEL_PRODUCT_EM061K_LWW		0x6008
@@ -1232,6 +1233,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0700, 0xff), /* BG95 */

	  .driver_info = RSVD(3) | ZLP },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0x40) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),

	  .driver_info = ZLP },
@@ -1244,6 +1246,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },



	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
@@ -2242,6 +2245,8 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE(0x0489, 0xe0b5),						/* Foxconn T77W968 ESIM */

	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },

	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0da, 0xff),                     /* Foxconn T99W265 MBIM variant */

	  .driver_info = RSVD(3) | RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff),			/* Foxconn T99W265 MBIM */

	  .driver_info = RSVD(3) },

	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0ee, 0xff),			/* Foxconn T99W368 MBIM */