diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2014-01-31 16:30:52 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2014-01-31 16:30:52 -0600 |
| commit | df4f3e42bea135c887806f5a3618932ad172edee (patch) | |
| tree | 007e22a2db830eb1735417fb1c9e12370d0082e6 /multitech/recipes/linux | |
| parent | 2956a16aad220f8dc531497a24055ccc451c4ff9 (diff) | |
linux-2.6.39-at91: update telit patch to add LE920
Diffstat (limited to 'multitech/recipes/linux')
| -rw-r--r-- | multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit-20140120.patch (renamed from multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit.patch) | 40 | ||||
| -rw-r--r-- | multitech/recipes/linux/linux_2.6.39-at91.bb | 2 |
2 files changed, 30 insertions, 12 deletions
diff --git a/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit.patch b/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit-20140120.patch index 0a4baa1..a5c666f 100644 --- a/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit.patch +++ b/multitech/recipes/linux/linux-2.6.39-at91/linux-2.6.39.4-option-telit-20140120.patch @@ -14,30 +14,48 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/usb/serial/option.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c -index 005511b..f9b11fb 100644 ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -307,6 +307,9 @@ static void option_instat_callback(struct urb *urb); +Index: git/drivers/usb/serial/option.c +=================================================================== +--- git.orig/drivers/usb/serial/option.c 2014-01-20 11:23:31.341035594 -0600 ++++ git/drivers/usb/serial/option.c 2014-01-20 11:27:29.449162530 -0600 +@@ -300,6 +300,13 @@ #define TELIT_VENDOR_ID 0x1bc7 #define TELIT_PRODUCT_UC864E 0x1003 #define TELIT_PRODUCT_UC864G 0x1004 +#define TELIT_PRODUCT_CC864_DUAL 0x1005 +#define TELIT_PRODUCT_CC864_SINGLE 0x1006 +#define TELIT_PRODUCT_DE910_DUAL 0x1010 ++#define TELIT_PRODUCT_CE910_DUAL 0x1011 ++#define TELIT_PRODUCT_LE920 0x1201 ++#define TELIT_PRODUCT_UE910_V2 0x1012 ++ /* ZTE PRODUCTS */ #define ZTE_VENDOR_ID 0x19d2 -@@ -771,6 +774,9 @@ static const struct usb_device_id option_ids[] = { +@@ -638,6 +645,12 @@ { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CE910_DUAL) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ - { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), - .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, --- -1.7.7.6 - + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) }, +@@ -1136,6 +1149,13 @@ + serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA) + return -ENODEV; + ++ /* Don't bind interfaces 1,7 on Telit LE920 */ ++ if (serial->dev->descriptor.idVendor == TELIT_VENDOR_ID && ++ serial->dev->descriptor.idProduct == TELIT_PRODUCT_LE920 && ++ (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1 || ++ serial->interface->cur_altsetting->desc.bInterfaceNumber == 7)) ++ return -ENODEV; ++ + data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); + + if (!data) diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb index 75c3d48..e5c5d69 100644 --- a/multitech/recipes/linux/linux_2.6.39-at91.bb +++ b/multitech/recipes/linux/linux_2.6.39-at91.bb @@ -24,7 +24,7 @@ COMMON_PATCHES = " \ file://linux-2.6.39.4-atmel_serial_disable_hwhs.patch \ file://linux-2.6.39.4-at91sam9_wdt-10second-timeout.patch \ file://linux-2.6.35.14-option-zte.patch \ - file://linux-2.6.39.4-option-telit.patch \ + file://linux-2.6.39.4-option-telit-20140120.patch \ file://linux-2.6.38-sierra-1.7.40.patch \ file://linux-2.6.39.4-cdc-acm-ignore-exar-devices.patch \ " |