Changeset 28377 for branches/backfire


Ignore:
Timestamp:
2011-10-06T20:46:48+02:00 (5 years ago)
Author:
jow
Message:

[backfire] backport r28376

Location:
branches/backfire/target/linux/generic-2.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/target/linux/generic-2.6/patches-2.6.30/802-usb_serial_option_add_more_devices.patch

    r26909 r28377  
    99 #define QUANTA_VENDOR_ID                       0x0408 
    1010 #define QUANTA_PRODUCT_Q101                    0xEA02 
    11 @@ -304,6 +305,10 @@ static int  option_resume(struct usb_ser 
     11@@ -179,6 +180,10 @@ static int  option_resume(struct usb_ser 
     12 /* MERLIN EVDO PRODUCTS */ 
     13 #define NOVATELWIRELESS_PRODUCT_V640           0x1100 
     14 #define NOVATELWIRELESS_PRODUCT_V620           0x1110 
     15+#define HUAWEI_PRODUCT_K3770                   0x14C9 
     16+#define HUAWEI_PRODUCT_K3771                   0x14CA 
     17+#define HUAWEI_PRODUCT_K4510                   0x14CB 
     18+#define HUAWEI_PRODUCT_K4511                   0x14CC 
     19 #define NOVATELWIRELESS_PRODUCT_V740           0x1120 
     20 #define NOVATELWIRELESS_PRODUCT_V720           0x1130 
     21  
     22@@ -304,6 +309,10 @@ static int  option_resume(struct usb_ser 
    1223 #define DLINK_VENDOR_ID                                0x1186 
    1324 #define DLINK_PRODUCT_DWM_652                  0x3e04 
     
    2031 static struct usb_device_id option_ids[] = { 
    2132        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, 
    22 @@ -402,6 +407,7 @@ static struct usb_device_id option_ids[] 
     33@@ -401,7 +410,16 @@ static struct usb_device_id option_ids[] 
     34        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) }, 
    2335        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, 
    2436        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, 
     37+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) }, 
     38+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) }, 
     39+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) }, 
     40+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) }, 
     41+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) }, 
     42+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) }, 
     43+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) }, 
     44+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) }, 
    2545        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, 
    2646+       { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) }, 
     
    2848        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ 
    2949        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */ 
    30 @@ -523,6 +529,7 @@ static struct usb_device_id option_ids[] 
     50@@ -523,6 +541,7 @@ static struct usb_device_id option_ids[] 
    3151        { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, 
    3252        { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) }, 
  • branches/backfire/target/linux/generic-2.6/patches-2.6.32/802-usb_serial_option_add_more_devices.patch

    r26907 r28377  
    11--- a/drivers/usb/serial/option.c 
    22+++ b/drivers/usb/serial/option.c 
    3 @@ -169,6 +169,7 @@ static int  option_resume(struct usb_ser 
     3@@ -168,7 +168,12 @@ static int  option_resume(struct usb_ser 
     4 #define HUAWEI_PRODUCT_K4505                   0x1464 
    45 #define HUAWEI_PRODUCT_K3765                   0x1465 
    56 #define HUAWEI_PRODUCT_E14AC                   0x14AC 
     7+#define HUAWEI_PRODUCT_K3770                   0x14C9 
     8+#define HUAWEI_PRODUCT_K3771                   0x14CA 
     9+#define HUAWEI_PRODUCT_K4510                   0x14CB 
     10+#define HUAWEI_PRODUCT_K4511                   0x14CC 
    611 #define HUAWEI_PRODUCT_ETS1220                 0x1803 
    712+#define HUAWEI_PRODUCT_E173S                   0x1C05 
     
    914 #define QUANTA_VENDOR_ID                       0x0408 
    1015 #define QUANTA_PRODUCT_Q101                    0xEA02 
    11 @@ -338,6 +339,7 @@ static int  option_resume(struct usb_ser 
     16@@ -338,6 +343,7 @@ static int  option_resume(struct usb_ser 
    1217 /* ALCATEL PRODUCTS */ 
    1318 #define ALCATEL_VENDOR_ID                      0x1bbb 
     
    1722 #define PIRELLI_VENDOR_ID                      0x1266 
    1823 #define PIRELLI_PRODUCT_C100_1                 0x1002 
    19 @@ -480,6 +482,7 @@ static struct usb_device_id option_ids[] 
     24@@ -480,6 +486,15 @@ static struct usb_device_id option_ids[] 
    2025        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, 
    2126        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, 
    2227        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) }, 
     28+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) }, 
     29+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) }, 
     30+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) }, 
     31+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) }, 
     32+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) }, 
     33+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) }, 
     34+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) }, 
     35+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) }, 
    2336+       { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) }, 
    2437        { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) }, 
    2538        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ 
    2639        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */ 
    27 @@ -874,6 +877,7 @@ static struct usb_device_id option_ids[] 
     40@@ -874,6 +889,7 @@ static struct usb_device_id option_ids[] 
    2841        { USB_DEVICE(ALINK_VENDOR_ID, 0xce16) }, 
    2942        { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, 
Note: See TracChangeset for help on using the changeset viewer.