mirror of
https://github.com/torvalds/linux.git
synced 2024-11-30 16:11:38 +00:00
USB-serial device ids for 6.5-rc4
Here are some new modem device ids and a new "simple" driver for a CAN bus device. Included is also a patch sorting the "simple" driver entries in order to make it more obvious where new ones should be added. All have been in linux-next with no reported issues. -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQHbPq+cpGvN/peuzMLxc3C7H1lCAUCZL/U7QAKCRALxc3C7H1l CBZkAQDUrdx0kCeMoKM956BVB1MjWRHGqfAxdU+8AsWSHTznKQEAlC3KxQDnqwgI UIucnbHKXnKb9kfFSAnYJVq1yqkxPAI= =nyop -----END PGP SIGNATURE----- Merge tag 'usb-serial-6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus Johan writes: USB-serial device ids for 6.5-rc4 Here are some new modem device ids and a new "simple" driver for a CAN bus device. Included is also a patch sorting the "simple" driver entries in order to make it more obvious where new ones should be added. All have been in linux-next with no reported issues. * tag 'usb-serial-6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: simple: sort driver entries USB: serial: simple: add Kaufmann RKS+CAN VCP USB: serial: option: add Quectel EC200A module support USB: serial: option: support Quectel EM060K_128
This commit is contained in:
Greg Kroah-Hartman
commit
13e098b58b
@ -251,6 +251,7 @@ static void option_instat_callback(struct urb *urb);
|
||||
#define QUECTEL_PRODUCT_EM061K_LTA 0x0123
|
||||
#define QUECTEL_PRODUCT_EM061K_LMS 0x0124
|
||||
#define QUECTEL_PRODUCT_EC25 0x0125
|
||||
#define QUECTEL_PRODUCT_EM060K_128 0x0128
|
||||
#define QUECTEL_PRODUCT_EG91 0x0191
|
||||
#define QUECTEL_PRODUCT_EG95 0x0195
|
||||
#define QUECTEL_PRODUCT_BG96 0x0296
|
||||
@ -268,6 +269,7 @@ static void option_instat_callback(struct urb *urb);
|
||||
#define QUECTEL_PRODUCT_RM520N 0x0801
|
||||
#define QUECTEL_PRODUCT_EC200U 0x0901
|
||||
#define QUECTEL_PRODUCT_EC200S_CN 0x6002
|
||||
#define QUECTEL_PRODUCT_EC200A 0x6005
|
||||
#define QUECTEL_PRODUCT_EM061K_LWW 0x6008
|
||||
#define QUECTEL_PRODUCT_EM061K_LCN 0x6009
|
||||
#define QUECTEL_PRODUCT_EC200T 0x6026
|
||||
@ -1197,6 +1199,9 @@ static const struct usb_device_id option_ids[] = {
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0x00, 0x40) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x30) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x40) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0xff, 0x30) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0x00, 0x40) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K_128, 0xff, 0xff, 0x40) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x30) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0x00, 0x40) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM061K_LCN, 0xff, 0xff, 0x40) },
|
||||
@ -1225,6 +1230,7 @@ static const struct usb_device_id option_ids[] = {
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0900, 0xff, 0, 0), /* RM500U-CN */
|
||||
.driver_info = ZLP },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200A, 0xff, 0, 0) },
|
||||
{ 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) },
|
||||
|
||||
@ -38,16 +38,6 @@ static struct usb_serial_driver vendor##_device = { \
|
||||
{ USB_DEVICE(0x0a21, 0x8001) } /* MMT-7305WW */
|
||||
DEVICE(carelink, CARELINK_IDS);
|
||||
|
||||
/* ZIO Motherboard USB driver */
|
||||
#define ZIO_IDS() \
|
||||
{ USB_DEVICE(0x1CBE, 0x0103) }
|
||||
DEVICE(zio, ZIO_IDS);
|
||||
|
||||
/* Funsoft Serial USB driver */
|
||||
#define FUNSOFT_IDS() \
|
||||
{ USB_DEVICE(0x1404, 0xcddc) }
|
||||
DEVICE(funsoft, FUNSOFT_IDS);
|
||||
|
||||
/* Infineon Flashloader driver */
|
||||
#define FLASHLOADER_IDS() \
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
|
||||
@ -55,6 +45,11 @@ DEVICE(funsoft, FUNSOFT_IDS);
|
||||
{ USB_DEVICE(0x8087, 0x0801) }
|
||||
DEVICE(flashloader, FLASHLOADER_IDS);
|
||||
|
||||
/* Funsoft Serial USB driver */
|
||||
#define FUNSOFT_IDS() \
|
||||
{ USB_DEVICE(0x1404, 0xcddc) }
|
||||
DEVICE(funsoft, FUNSOFT_IDS);
|
||||
|
||||
/* Google Serial USB SubClass */
|
||||
#define GOOGLE_IDS() \
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(0x18d1, \
|
||||
@ -63,16 +58,21 @@ DEVICE(flashloader, FLASHLOADER_IDS);
|
||||
0x01) }
|
||||
DEVICE(google, GOOGLE_IDS);
|
||||
|
||||
/* HP4x (48/49) Generic Serial driver */
|
||||
#define HP4X_IDS() \
|
||||
{ USB_DEVICE(0x03f0, 0x0121) }
|
||||
DEVICE(hp4x, HP4X_IDS);
|
||||
|
||||
/* KAUFMANN RKS+CAN VCP */
|
||||
#define KAUFMANN_IDS() \
|
||||
{ USB_DEVICE(0x16d0, 0x0870) }
|
||||
DEVICE(kaufmann, KAUFMANN_IDS);
|
||||
|
||||
/* Libtransistor USB console */
|
||||
#define LIBTRANSISTOR_IDS() \
|
||||
{ USB_DEVICE(0x1209, 0x8b00) }
|
||||
DEVICE(libtransistor, LIBTRANSISTOR_IDS);
|
||||
|
||||
/* ViVOpay USB Serial Driver */
|
||||
#define VIVOPAY_IDS() \
|
||||
{ USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
|
||||
DEVICE(vivopay, VIVOPAY_IDS);
|
||||
|
||||
/* Motorola USB Phone driver */
|
||||
#define MOTO_IDS() \
|
||||
{ USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \
|
||||
@ -101,10 +101,10 @@ DEVICE(nokia, NOKIA_IDS);
|
||||
{ USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */
|
||||
DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
|
||||
|
||||
/* HP4x (48/49) Generic Serial driver */
|
||||
#define HP4X_IDS() \
|
||||
{ USB_DEVICE(0x03f0, 0x0121) }
|
||||
DEVICE(hp4x, HP4X_IDS);
|
||||
/* Siemens USB/MPI adapter */
|
||||
#define SIEMENS_IDS() \
|
||||
{ USB_DEVICE(0x908, 0x0004) }
|
||||
DEVICE(siemens_mpi, SIEMENS_IDS);
|
||||
|
||||
/* Suunto ANT+ USB Driver */
|
||||
#define SUUNTO_IDS() \
|
||||
@ -112,45 +112,52 @@ DEVICE(hp4x, HP4X_IDS);
|
||||
{ USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
|
||||
DEVICE(suunto, SUUNTO_IDS);
|
||||
|
||||
/* Siemens USB/MPI adapter */
|
||||
#define SIEMENS_IDS() \
|
||||
{ USB_DEVICE(0x908, 0x0004) }
|
||||
DEVICE(siemens_mpi, SIEMENS_IDS);
|
||||
/* ViVOpay USB Serial Driver */
|
||||
#define VIVOPAY_IDS() \
|
||||
{ USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
|
||||
DEVICE(vivopay, VIVOPAY_IDS);
|
||||
|
||||
/* ZIO Motherboard USB driver */
|
||||
#define ZIO_IDS() \
|
||||
{ USB_DEVICE(0x1CBE, 0x0103) }
|
||||
DEVICE(zio, ZIO_IDS);
|
||||
|
||||
/* All of the above structures mushed into two lists */
|
||||
static struct usb_serial_driver * const serial_drivers[] = {
|
||||
&carelink_device,
|
||||
&zio_device,
|
||||
&funsoft_device,
|
||||
&flashloader_device,
|
||||
&funsoft_device,
|
||||
&google_device,
|
||||
&hp4x_device,
|
||||
&kaufmann_device,
|
||||
&libtransistor_device,
|
||||
&vivopay_device,
|
||||
&moto_modem_device,
|
||||
&motorola_tetra_device,
|
||||
&nokia_device,
|
||||
&novatel_gps_device,
|
||||
&hp4x_device,
|
||||
&suunto_device,
|
||||
&siemens_mpi_device,
|
||||
&suunto_device,
|
||||
&vivopay_device,
|
||||
&zio_device,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct usb_device_id id_table[] = {
|
||||
CARELINK_IDS(),
|
||||
ZIO_IDS(),
|
||||
FUNSOFT_IDS(),
|
||||
FLASHLOADER_IDS(),
|
||||
FUNSOFT_IDS(),
|
||||
GOOGLE_IDS(),
|
||||
HP4X_IDS(),
|
||||
KAUFMANN_IDS(),
|
||||
LIBTRANSISTOR_IDS(),
|
||||
VIVOPAY_IDS(),
|
||||
MOTO_IDS(),
|
||||
MOTOROLA_TETRA_IDS(),
|
||||
NOKIA_IDS(),
|
||||
NOVATEL_IDS(),
|
||||
HP4X_IDS(),
|
||||
SUUNTO_IDS(),
|
||||
SIEMENS_IDS(),
|
||||
SUUNTO_IDS(),
|
||||
VIVOPAY_IDS(),
|
||||
ZIO_IDS(),
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(usb, id_table);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user