aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Mork2013-01-23 03:44:36 -0600
committerGreg Kroah-Hartman2013-02-28 08:32:27 -0600
commit2466f8620e8fb814f2d1c72584e1e4e95ca50ead (patch)
treea0739963e4cf5d1e52b1fe6d626175e1dbd72e88
parent7a9a20ea77e7508c795dead9ab2f6c98a617762d (diff)
downloadkernel-common-2466f8620e8fb814f2d1c72584e1e4e95ca50ead.tar.gz
kernel-common-2466f8620e8fb814f2d1c72584e1e4e95ca50ead.tar.xz
kernel-common-2466f8620e8fb814f2d1c72584e1e4e95ca50ead.zip
USB: option: add and update Alcatel modems
commit f8f0302bbcbd1b14655bef29f6996a2152be559d upstream. Adding three currently unsupported modems based on information from .inf driver files: Diag VID_1BBB&PID_0052&MI_00 AGPS VID_1BBB&PID_0052&MI_01 VOICE VID_1BBB&PID_0052&MI_02 AT VID_1BBB&PID_0052&MI_03 Modem VID_1BBB&PID_0052&MI_05 wwan VID_1BBB&PID_0052&MI_06 Diag VID_1BBB&PID_00B6&MI_00 AT VID_1BBB&PID_00B6&MI_01 Modem VID_1BBB&PID_00B6&MI_02 wwan VID_1BBB&PID_00B6&MI_03 Diag VID_1BBB&PID_00B7&MI_00 AGPS VID_1BBB&PID_00B7&MI_01 VOICE VID_1BBB&PID_00B7&MI_02 AT VID_1BBB&PID_00B7&MI_03 Modem VID_1BBB&PID_00B7&MI_04 wwan VID_1BBB&PID_00B7&MI_05 Updating the blacklist info for the X060S_X200 and X220_X500D, reserving interfaces for a wwan driver, based on wwan VID_1BBB&PID_0000&MI_04 wwan VID_1BBB&PID_0017&MI_06 Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/option.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 52cd814176a..19e1a80e004 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -479,6 +479,7 @@ static const struct option_blacklist_info four_g_w14_blacklist = {
479 479
480static const struct option_blacklist_info alcatel_x200_blacklist = { 480static const struct option_blacklist_info alcatel_x200_blacklist = {
481 .sendsetup = BIT(0) | BIT(1), 481 .sendsetup = BIT(0) | BIT(1),
482 .reserved = BIT(4),
482}; 483};
483 484
484static const struct option_blacklist_info zte_0037_blacklist = { 485static const struct option_blacklist_info zte_0037_blacklist = {
@@ -1215,7 +1216,14 @@ static const struct usb_device_id option_ids[] = {
1215 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), 1216 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
1216 .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist 1217 .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
1217 }, 1218 },
1218 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, 1219 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
1220 .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
1221 { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052),
1222 .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
1223 { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6),
1224 .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
1225 { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7),
1226 .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
1219 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), 1227 { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
1220 .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, 1228 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
1221 { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, 1229 { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },