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-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for v4.11-rc4

Some more device ids for option and qcserial.

Signed-off-by: Johan Hovold <johan@kernel.org>

Greg Kroah-Hartman fd290e70 5617c05d

+18 -1
+16 -1
drivers/usb/serial/option.c
··· 233 233 #define BANDRICH_PRODUCT_1012 0x1012 234 234 235 235 #define QUALCOMM_VENDOR_ID 0x05C6 236 + /* These Quectel products use Qualcomm's vendor ID */ 237 + #define QUECTEL_PRODUCT_UC20 0x9003 238 + #define QUECTEL_PRODUCT_UC15 0x9090 239 + 240 + #define QUECTEL_VENDOR_ID 0x2c7c 241 + /* These Quectel products use Quectel's vendor ID */ 242 + #define QUECTEL_PRODUCT_EC21 0x0121 243 + #define QUECTEL_PRODUCT_EC25 0x0125 236 244 237 245 #define CMOTECH_VENDOR_ID 0x16d8 238 246 #define CMOTECH_PRODUCT_6001 0x6001 ··· 1169 1161 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ 1170 1162 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ 1171 1163 { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ 1172 - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */ 1164 + /* Quectel products using Qualcomm vendor ID */ 1165 + { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, 1166 + { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), 1167 + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, 1168 + /* Quectel products using Quectel vendor ID */ 1169 + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21), 1170 + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, 1171 + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25), 1173 1172 .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, 1174 1173 { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, 1175 1174 { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
+2
drivers/usb/serial/qcserial.c
··· 169 169 {DEVICE_SWI(0x413c, 0x81a9)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ 170 170 {DEVICE_SWI(0x413c, 0x81b1)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */ 171 171 {DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ 172 + {DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */ 173 + {DEVICE_SWI(0x413c, 0x81b6)}, /* Dell Wireless 5811e QDL */ 172 174 173 175 /* Huawei devices */ 174 176 {DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */