[backfire] backport r26906

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26907 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/patches-2.6.30/802-usb_serial_option_add_more_devices.patch b/target/linux/generic-2.6/patches-2.6.30/802-usb_serial_option_add_more_devices.patch
new file mode 100644 (file)
index 0000000..c0df7bb
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/802-usb_serial_option_add_more_devices.patch
@@ -0,0 +1,37 @@
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -161,6 +161,7 @@ static int  option_resume(struct usb_ser
+ #define HUAWEI_PRODUCT_E143D                  0x143D
+ #define HUAWEI_PRODUCT_E143E                  0x143E
+ #define HUAWEI_PRODUCT_E143F                  0x143F
++#define HUAWEI_PRODUCT_E173S                  0x1C05
+ 
+ #define QUANTA_VENDOR_ID                      0x0408
+ #define QUANTA_PRODUCT_Q101                   0xEA02
+@@ -304,6 +305,10 @@ static int  option_resume(struct usb_ser
+ #define DLINK_VENDOR_ID                               0x1186
+ #define DLINK_PRODUCT_DWM_652                 0x3e04
+ 
++/* ALCATEL PRODUCTS */
++#define ALCATEL_VENDOR_ID                     0x1bbb
++#define ALCATEL_PRODUCT_X220D                 0x0017
++
+ 
+ static struct usb_device_id option_ids[] = {
+       { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
+@@ -402,6 +407,7 @@ static struct usb_device_id option_ids[]
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
++      { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) },
+       { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
+       { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
+       { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
+@@ -523,6 +529,7 @@ static struct usb_device_id option_ids[]
+       { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
+       { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
+       { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
++      { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220D) }, /* BenQ H20 */
+       { } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, option_ids);

diff --git a/target/linux/generic-2.6/patches-2.6.32/802-usb_serial_option_add_more_devices.patch b/target/linux/generic-2.6/patches-2.6.32/802-usb_serial_option_add_more_devices.patch
new file mode 100644 (file)
index 0000000..02d1d70
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/802-usb_serial_option_add_more_devices.patch
@@ -0,0 +1,34 @@
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -169,6 +169,7 @@ static int  option_resume(struct usb_ser
+ #define HUAWEI_PRODUCT_K3765                  0x1465
+ #define HUAWEI_PRODUCT_E14AC                  0x14AC
+ #define HUAWEI_PRODUCT_ETS1220                        0x1803
++#define HUAWEI_PRODUCT_E173S                  0x1C05
+ 
+ #define QUANTA_VENDOR_ID                      0x0408
+ #define QUANTA_PRODUCT_Q101                   0xEA02
+@@ -338,6 +339,7 @@ static int  option_resume(struct usb_ser
+ /* ALCATEL PRODUCTS */
+ #define ALCATEL_VENDOR_ID                     0x1bbb
+ #define ALCATEL_PRODUCT_X060S                 0x0000
++#define ALCATEL_PRODUCT_X220D                 0x0017
+ 
+ #define PIRELLI_VENDOR_ID                     0x1266
+ #define PIRELLI_PRODUCT_C100_1                        0x1002
+@@ -480,6 +482,7 @@ static struct usb_device_id option_ids[]
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) },
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
+       { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) },
++      { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) },
+       { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
+       { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
+       { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
+@@ -874,6 +877,7 @@ static struct usb_device_id option_ids[]
+       { USB_DEVICE(ALINK_VENDOR_ID, 0xce16) },
+       { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
+       { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
++      { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220D) },
+       { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
+       { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
+       { USB_DEVICE(FOUR_G_SYSTEMS_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14) },