projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 90594201 GKH |
1 | From 6e9f44eaaef0df7b846e9316fa9ca72a02025d44 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dan Williams <dcbw@redhat.com> | |
| 3 | Date: Thu, 9 Mar 2017 11:32:28 -0600 | |
| 4 | Subject: USB: serial: option: add Quectel UC15, UC20, EC21, and EC25 modems | |
| 5 | ||
| 6 | From: Dan Williams <dcbw@redhat.com> | |
| 7 | ||
| 8 | commit 6e9f44eaaef0df7b846e9316fa9ca72a02025d44 upstream. | |
| 9 | ||
| 10 | Add Quectel UC15, UC20, EC21, and EC25. The EC20 is handled by | |
| 11 | qcserial due to a USB VID/PID conflict with an existing Acer | |
| 12 | device. | |
| 13 | ||
| 14 | Signed-off-by: Dan Williams <dcbw@redhat.com> | |
| 15 | Signed-off-by: Johan Hovold <johan@kernel.org> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 17 | ||
| 18 | --- | |
| 19 | drivers/usb/serial/option.c | 17 ++++++++++++++++- | |
| 20 | 1 file changed, 16 insertions(+), 1 deletion(-) | |
| 21 | ||
| 22 | --- a/drivers/usb/serial/option.c | |
| 23 | +++ b/drivers/usb/serial/option.c | |
| 24 | @@ -233,6 +233,14 @@ static void option_instat_callback(struc | |
| 25 | #define BANDRICH_PRODUCT_1012 0x1012 | |
| 26 | ||
| 27 | #define QUALCOMM_VENDOR_ID 0x05C6 | |
| 28 | +/* These Quectel products use Qualcomm's vendor ID */ | |
| 29 | +#define QUECTEL_PRODUCT_UC20 0x9003 | |
| 30 | +#define QUECTEL_PRODUCT_UC15 0x9090 | |
| 31 | + | |
| 32 | +#define QUECTEL_VENDOR_ID 0x2c7c | |
| 33 | +/* These Quectel products use Quectel's vendor ID */ | |
| 34 | +#define QUECTEL_PRODUCT_EC21 0x0121 | |
| 35 | +#define QUECTEL_PRODUCT_EC25 0x0125 | |
| 36 | ||
| 37 | #define CMOTECH_VENDOR_ID 0x16d8 | |
| 38 | #define CMOTECH_PRODUCT_6001 0x6001 | |
| 39 | @@ -1161,7 +1169,14 @@ static const struct usb_device_id option | |
| 40 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | |
| 41 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ | |
| 42 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ | |
| 43 | - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */ | |
| 44 | + /* Quectel products using Qualcomm vendor ID */ | |
| 45 | + { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, | |
| 46 | + { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), | |
| 47 | + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | |
| 48 | + /* Quectel products using Quectel vendor ID */ | |
| 49 | + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21), | |
| 50 | + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | |
| 51 | + { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25), | |
| 52 | .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | |
| 53 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, | |
| 54 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, |