tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Johan writes:

USB-serial device id for 6.11-rc6

Here's a new modem device id.

This one has been in linux-next with no reported issues.

* tag 'usb-serial-6.11-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
USB: serial: option: add MeiG Smart SRM825L

Greg Kroah-Hartman 58c2fa54 740f2e27

+5
unified split
+5
drivers/usb/serial/option.c
··· 619 620 /* MeiG Smart Technology products */ 621 #define MEIGSMART_VENDOR_ID 0x2dee 622 /* MeiG Smart SLM320 based on UNISOC UIS8910 */ 623 #define MEIGSMART_PRODUCT_SLM320 0x4d41 624 ··· 2368 { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, 2369 { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, 2370 { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SLM320, 0xff, 0, 0) }, 2371 { } /* Terminating entry */ 2372 }; 2373 MODULE_DEVICE_TABLE(usb, option_ids);
··· 619 620 /* MeiG Smart Technology products */ 621 #define MEIGSMART_VENDOR_ID 0x2dee 622 + /* MeiG Smart SRM825L based on Qualcomm 315 */ 623 + #define MEIGSMART_PRODUCT_SRM825L 0x4d22 624 /* MeiG Smart SLM320 based on UNISOC UIS8910 */ 625 #define MEIGSMART_PRODUCT_SLM320 0x4d41 626 ··· 2366 { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, 2367 { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, 2368 { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SLM320, 0xff, 0, 0) }, 2369 + { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SRM825L, 0xff, 0xff, 0x30) }, 2370 + { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SRM825L, 0xff, 0xff, 0x40) }, 2371 + { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SRM825L, 0xff, 0xff, 0x60) }, 2372 { } /* Terminating entry */ 2373 }; 2374 MODULE_DEVICE_TABLE(usb, option_ids);