diff options
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r-- | drivers/usb/serial/option.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 81f6a572f01..9bab34cf01d 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -315,6 +315,7 @@ static void option_instat_callback(struct urb *urb); | |||
315 | #define TOSHIBA_PRODUCT_G450 0x0d45 | 315 | #define TOSHIBA_PRODUCT_G450 0x0d45 |
316 | 316 | ||
317 | #define ALINK_VENDOR_ID 0x1e0e | 317 | #define ALINK_VENDOR_ID 0x1e0e |
318 | #define SIMCOM_PRODUCT_SIM7100E 0x9001 /* Yes, ALINK_VENDOR_ID */ | ||
318 | #define ALINK_PRODUCT_PH300 0x9100 | 319 | #define ALINK_PRODUCT_PH300 0x9100 |
319 | #define ALINK_PRODUCT_3GU 0x9200 | 320 | #define ALINK_PRODUCT_3GU 0x9200 |
320 | 321 | ||
@@ -615,6 +616,10 @@ static const struct option_blacklist_info zte_1255_blacklist = { | |||
615 | .reserved = BIT(3) | BIT(4), | 616 | .reserved = BIT(3) | BIT(4), |
616 | }; | 617 | }; |
617 | 618 | ||
619 | static const struct option_blacklist_info simcom_sim7100e_blacklist = { | ||
620 | .reserved = BIT(5) | BIT(6), | ||
621 | }; | ||
622 | |||
618 | static const struct option_blacklist_info telit_le910_blacklist = { | 623 | static const struct option_blacklist_info telit_le910_blacklist = { |
619 | .sendsetup = BIT(0), | 624 | .sendsetup = BIT(0), |
620 | .reserved = BIT(1) | BIT(2), | 625 | .reserved = BIT(1) | BIT(2), |
@@ -1130,6 +1135,8 @@ static const struct usb_device_id option_ids[] = { | |||
1130 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) }, | 1135 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) }, |
1131 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, | 1136 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, |
1132 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ | 1137 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ |
1138 | { USB_DEVICE_AND_INTERFACE_INFO(QUALCOMM_VENDOR_ID, 0x6001, 0xff, 0xff, 0xff), /* 4G LTE usb-modem U901 */ | ||
1139 | .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | ||
1133 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | 1140 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ |
1134 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ | 1141 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ |
1135 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ | 1142 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ |
@@ -1645,6 +1652,8 @@ static const struct usb_device_id option_ids[] = { | |||
1645 | { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, | 1652 | { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, |
1646 | { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) }, | 1653 | { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) }, |
1647 | { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, | 1654 | { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, |
1655 | { USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E), | ||
1656 | .driver_info = (kernel_ulong_t)&simcom_sim7100e_blacklist }, | ||
1648 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), | 1657 | { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), |
1649 | .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist | 1658 | .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist |
1650 | }, | 1659 | }, |