From: jow Date: Thu, 6 Oct 2011 18:46:48 +0000 (+0000) Subject: [backfire] backport r28376 X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=2a01013280f6174671e9667acebd10155ae5930b [backfire] backport r28376 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28377 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 index e6acd0324..e169fdecb 100644 --- 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 @@ -8,7 +8,18 @@ #define QUANTA_VENDOR_ID 0x0408 #define QUANTA_PRODUCT_Q101 0xEA02 -@@ -304,6 +305,10 @@ static int option_resume(struct usb_ser +@@ -179,6 +180,10 @@ static int option_resume(struct usb_ser + /* MERLIN EVDO PRODUCTS */ + #define NOVATELWIRELESS_PRODUCT_V640 0x1100 + #define NOVATELWIRELESS_PRODUCT_V620 0x1110 ++#define HUAWEI_PRODUCT_K3770 0x14C9 ++#define HUAWEI_PRODUCT_K3771 0x14CA ++#define HUAWEI_PRODUCT_K4510 0x14CB ++#define HUAWEI_PRODUCT_K4511 0x14CC + #define NOVATELWIRELESS_PRODUCT_V740 0x1120 + #define NOVATELWIRELESS_PRODUCT_V720 0x1130 + +@@ -304,6 +309,10 @@ static int option_resume(struct usb_ser #define DLINK_VENDOR_ID 0x1186 #define DLINK_PRODUCT_DWM_652 0x3e04 @@ -19,15 +30,24 @@ 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[] +@@ -401,7 +410,16 @@ static struct usb_device_id option_ids[] + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) }, { 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_K3770, 0xff, 0x02, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) }, { 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[] +@@ -523,6 +541,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 */ 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 index 02d1d7030..6ab2dfe19 100644 --- 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 @@ -1,14 +1,19 @@ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -169,6 +169,7 @@ static int option_resume(struct usb_ser +@@ -168,7 +168,12 @@ static int option_resume(struct usb_ser + #define HUAWEI_PRODUCT_K4505 0x1464 #define HUAWEI_PRODUCT_K3765 0x1465 #define HUAWEI_PRODUCT_E14AC 0x14AC ++#define HUAWEI_PRODUCT_K3770 0x14C9 ++#define HUAWEI_PRODUCT_K3771 0x14CA ++#define HUAWEI_PRODUCT_K4510 0x14CB ++#define HUAWEI_PRODUCT_K4511 0x14CC #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 +@@ -338,6 +343,7 @@ static int option_resume(struct usb_ser /* ALCATEL PRODUCTS */ #define ALCATEL_VENDOR_ID 0x1bbb #define ALCATEL_PRODUCT_X060S 0x0000 @@ -16,15 +21,23 @@ #define PIRELLI_VENDOR_ID 0x1266 #define PIRELLI_PRODUCT_C100_1 0x1002 -@@ -480,6 +482,7 @@ static struct usb_device_id option_ids[] +@@ -480,6 +486,15 @@ 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_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) }, + { 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[] +@@ -874,6 +889,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) },