From fb9b217f120d6fb88155a90c1fa7a081e0200ddd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 Jan 2013 04:49:38 -0800 Subject: [PATCH] 3.0-stable patches added patches: usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch usb-gadget-dummy-fix-enumeration-with-g_multi.patch usb-option-add-new-mediatek-pid-support.patch usb-option-add-nexpring-np10t-terminal-id.patch usb-option-add-telekom-speedstick-lte-ii.patch usb-option-blacklist-network-interface-on-zte-mf880.patch --- queue-3.0/series | 7 +++ ...pport-for-psc-scanning-magellan-800i.patch | 34 ++++++++++ ...chnologies-comet-caller-id-pid-added.patch | 48 ++++++++++++++ ...t-dummy-fix-enumeration-with-g_multi.patch | 63 +++++++++++++++++++ ...-option-add-new-mediatek-pid-support.patch | 45 +++++++++++++ ...ption-add-nexpring-np10t-terminal-id.patch | 39 ++++++++++++ ...option-add-telekom-speedstick-lte-ii.patch | 46 ++++++++++++++ ...klist-network-interface-on-zte-mf880.patch | 37 +++++++++++ 8 files changed, 319 insertions(+) create mode 100644 queue-3.0/usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch create mode 100644 queue-3.0/usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch create mode 100644 queue-3.0/usb-gadget-dummy-fix-enumeration-with-g_multi.patch create mode 100644 queue-3.0/usb-option-add-new-mediatek-pid-support.patch create mode 100644 queue-3.0/usb-option-add-nexpring-np10t-terminal-id.patch create mode 100644 queue-3.0/usb-option-add-telekom-speedstick-lte-ii.patch create mode 100644 queue-3.0/usb-option-blacklist-network-interface-on-zte-mf880.patch diff --git a/queue-3.0/series b/queue-3.0/series index bd24d0a9099..79bd80b29af 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -53,3 +53,10 @@ staging-speakup-avoid-out-of-range-access-in-synth_init.patch staging-speakup-avoid-out-of-range-access-in-synth_add.patch radeon-kms-force-rn50-chip-to-always-report-connected-on-analog-output.patch mac80211-use-del_timer_sync-for-final-sta-cleanup-timer-deletion.patch +usb-option-add-nexpring-np10t-terminal-id.patch +usb-option-blacklist-network-interface-on-zte-mf880.patch +usb-option-add-new-mediatek-pid-support.patch +usb-option-add-telekom-speedstick-lte-ii.patch +usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch +usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch +usb-gadget-dummy-fix-enumeration-with-g_multi.patch diff --git a/queue-3.0/usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch b/queue-3.0/usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch new file mode 100644 index 00000000000..f80a585fb15 --- /dev/null +++ b/queue-3.0/usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch @@ -0,0 +1,34 @@ +From 036915a7a402753c05b8d0529f5fd08805ab46d0 Mon Sep 17 00:00:00 2001 +From: Denis N Ladin +Date: Wed, 26 Dec 2012 18:29:44 +0500 +Subject: USB: cdc-acm: Add support for "PSC Scanning, Magellan 800i" + +From: Denis N Ladin + +commit 036915a7a402753c05b8d0529f5fd08805ab46d0 upstream. + +Adding support "PSC Scanning, Magellan 800i" in cdc-acm + +Very simple, but very necessary. +Suitable for all versions of the kernel > 2.6 + +Signed-off-by: Denis N Ladin +Acked-by: Oliver Neukum +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/class/cdc-acm.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/class/cdc-acm.c ++++ b/drivers/usb/class/cdc-acm.c +@@ -1509,6 +1509,9 @@ static const struct usb_device_id acm_id + { USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */ + .driver_info = NO_UNION_NORMAL, + }, ++ { USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */ ++ .driver_info = NO_UNION_NORMAL, ++ }, + { USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, diff --git a/queue-3.0/usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch b/queue-3.0/usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch new file mode 100644 index 00000000000..bedc784fef1 --- /dev/null +++ b/queue-3.0/usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch @@ -0,0 +1,48 @@ +From 8cf65dc386f3634a43312f436cc7a935476a40c4 Mon Sep 17 00:00:00 2001 +From: Tomasz Mloduchowski +Date: Sun, 13 Jan 2013 23:32:53 +0100 +Subject: usb: ftdi_sio: Crucible Technologies COMET Caller ID - pid added + +From: Tomasz Mloduchowski + +commit 8cf65dc386f3634a43312f436cc7a935476a40c4 upstream. + +Simple fix to add support for Crucible Technologies COMET Caller ID +USB decoder - a device containing FTDI USB/Serial converter chip, +handling 1200bps CallerID messages decoded from the phone line - +adding correct USB PID is sufficient. + +Tested to apply cleanly and work flawlessly against 3.6.9, 3.7.0-rc8 +and 3.8.0-rc3 on both amd64 and x86 arches. + +Signed-off-by: Tomasz Mloduchowski +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 8 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -879,6 +879,8 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) }, ++ /* Crucible Devices */ ++ { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -1259,3 +1259,9 @@ + * ATI command output: Cinterion MC55i + */ + #define FTDI_CINTERION_MC55I_PID 0xA951 ++ ++/* ++ * Product: Comet Caller ID decoder ++ * Manufacturer: Crucible Technologies ++ */ ++#define FTDI_CT_COMET_PID 0x8e08 diff --git a/queue-3.0/usb-gadget-dummy-fix-enumeration-with-g_multi.patch b/queue-3.0/usb-gadget-dummy-fix-enumeration-with-g_multi.patch new file mode 100644 index 00000000000..c621db8453a --- /dev/null +++ b/queue-3.0/usb-gadget-dummy-fix-enumeration-with-g_multi.patch @@ -0,0 +1,63 @@ +From 1d16638e3b9cc195bac18a8fcbca748f33c1bc24 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Tue, 20 Nov 2012 13:23:15 +0100 +Subject: usb: gadget: dummy: fix enumeration with g_multi + +From: Sebastian Andrzej Siewior + +commit 1d16638e3b9cc195bac18a8fcbca748f33c1bc24 upstream. + +If we do have endpoints named like "ep-a" then bEndpointAddress is +counted internally by the gadget framework. + +If we do have endpoints named like "ep-1" then bEndpointAddress is +assigned from the digit after "ep-". + +If we do have both, then it is likely that after we used up the +"generic" endpoints we will use the digits and thus assign one +bEndpointAddress to multiple endpoints. + +This theory can be proofed by using the completely enabled g_multi. +Without this patch, the mass storage won't enumerate and times out +because it shares endpoints with RNDIS. + +This patch also adds fills up the endpoints list so we have in total +endpoints 1 to 15 in + out available while some of them are restricted +to certain types like BULK or ISO. Without this change the nokia gadget +won't load because the system does not provide enough (BULK) endpoints +but it did before ep-a - ep-f were removed. + +Signed-off-by: Sebastian Andrzej Siewior +Acked-by: Alan Stern +Signed-off-by: Felipe Balbi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/gadget/dummy_hcd.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/drivers/usb/gadget/dummy_hcd.c ++++ b/drivers/usb/gadget/dummy_hcd.c +@@ -122,10 +122,7 @@ static const char ep0name [] = "ep0"; + static const char *const ep_name [] = { + ep0name, /* everyone has ep0 */ + +- /* act like a net2280: high speed, six configurable endpoints */ +- "ep-a", "ep-b", "ep-c", "ep-d", "ep-e", "ep-f", +- +- /* or like pxa250: fifteen fixed function endpoints */ ++ /* act like a pxa250: fifteen fixed function endpoints */ + "ep1in-bulk", "ep2out-bulk", "ep3in-iso", "ep4out-iso", "ep5in-int", + "ep6in-bulk", "ep7out-bulk", "ep8in-iso", "ep9out-iso", "ep10in-int", + "ep11in-bulk", "ep12out-bulk", "ep13in-iso", "ep14out-iso", +@@ -133,6 +130,10 @@ static const char *const ep_name [] = { + + /* or like sa1100: two fixed function endpoints */ + "ep1out-bulk", "ep2in-bulk", ++ ++ /* and now some generic EPs so we have enough in multi config */ ++ "ep3out", "ep4in", "ep5out", "ep6out", "ep7in", "ep8out", "ep9in", ++ "ep10out", "ep11out", "ep12in", "ep13out", "ep14in", "ep15out", + }; + #define DUMMY_ENDPOINTS ARRAY_SIZE(ep_name) + diff --git a/queue-3.0/usb-option-add-new-mediatek-pid-support.patch b/queue-3.0/usb-option-add-new-mediatek-pid-support.patch new file mode 100644 index 00000000000..4b7e2162a60 --- /dev/null +++ b/queue-3.0/usb-option-add-new-mediatek-pid-support.patch @@ -0,0 +1,45 @@ +From 94a85b633829b946eef53fc1825d526312fb856f Mon Sep 17 00:00:00 2001 +From: "Quentin.Li" +Date: Wed, 26 Dec 2012 16:58:22 +0800 +Subject: USB: option: Add new MEDIATEK PID support + +From: "Quentin.Li" + +commit 94a85b633829b946eef53fc1825d526312fb856f upstream. + +In option.c, add some new MEDIATEK PIDs support for MEDIATEK new products. This +is a MEDIATEK inc. release patch. + +Signed-off-by: Quentin.Li +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -429,9 +429,12 @@ static void option_instat_callback(struc + #define MEDIATEK_VENDOR_ID 0x0e8d + #define MEDIATEK_PRODUCT_DC_1COM 0x00a0 + #define MEDIATEK_PRODUCT_DC_4COM 0x00a5 ++#define MEDIATEK_PRODUCT_DC_4COM2 0x00a7 + #define MEDIATEK_PRODUCT_DC_5COM 0x00a4 + #define MEDIATEK_PRODUCT_7208_1COM 0x7101 + #define MEDIATEK_PRODUCT_7208_2COM 0x7102 ++#define MEDIATEK_PRODUCT_7103_2COM 0x7103 ++#define MEDIATEK_PRODUCT_7106_2COM 0x7106 + #define MEDIATEK_PRODUCT_FP_1COM 0x0003 + #define MEDIATEK_PRODUCT_FP_2COM 0x0023 + #define MEDIATEK_PRODUCT_FPDC_1COM 0x0043 +@@ -1299,6 +1302,10 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FP_2COM, 0x0a, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7103_2COM, 0xff, 0x00, 0x00) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) }, + { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, + { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, + { } /* Terminating entry */ diff --git a/queue-3.0/usb-option-add-nexpring-np10t-terminal-id.patch b/queue-3.0/usb-option-add-nexpring-np10t-terminal-id.patch new file mode 100644 index 00000000000..7a13957aafa --- /dev/null +++ b/queue-3.0/usb-option-add-nexpring-np10t-terminal-id.patch @@ -0,0 +1,39 @@ +From ad86e58661b38b279b7519d4e49c7a19dc1654bb Mon Sep 17 00:00:00 2001 +From: Dzianis Kahanovich +Date: Mon, 3 Dec 2012 16:06:26 +0300 +Subject: USB: option: add Nexpring NP10T terminal id + +From: Dzianis Kahanovich + +commit ad86e58661b38b279b7519d4e49c7a19dc1654bb upstream. + +Hyundai Petatel Inc. Nexpring NP10T terminal (EV-DO rev.A USB modem) ID + +Signed-off-by: Denis Kaganovich +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -441,6 +441,10 @@ static void option_instat_callback(struc + #define CELLIENT_VENDOR_ID 0x2692 + #define CELLIENT_PRODUCT_MEN200 0x9005 + ++/* Hyundai Petatel Inc. products */ ++#define PETATEL_VENDOR_ID 0x1ff4 ++#define PETATEL_PRODUCT_NP10T 0x600e ++ + /* some devices interfaces need special handling due to a number of reasons */ + enum option_blacklist_reason { + OPTION_BLACKLIST_NONE = 0, +@@ -1295,6 +1299,7 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) }, + { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, ++ { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/queue-3.0/usb-option-add-telekom-speedstick-lte-ii.patch b/queue-3.0/usb-option-add-telekom-speedstick-lte-ii.patch new file mode 100644 index 00000000000..577ae64fd7b --- /dev/null +++ b/queue-3.0/usb-option-add-telekom-speedstick-lte-ii.patch @@ -0,0 +1,46 @@ +From 5ec0085440ef8c2cf50002b34d5a504ee12aa2bf Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Fri, 28 Dec 2012 17:29:52 +0100 +Subject: USB: option: add Telekom Speedstick LTE II + +From: Bjørn Mork + +commit 5ec0085440ef8c2cf50002b34d5a504ee12aa2bf upstream. + +also known as Alcatel One Touch L100V LTE + +The driver description files gives these names to the vendor specific +functions on this modem: + + Application1: VID_1BBB&PID_011E&MI_00 + Application2: VID_1BBB&PID_011E&MI_01 + Modem: VID_1BBB&PID_011E&MI_03 + Ethernet: VID_1BBB&PID_011E&MI_04 + +Reported-by: Thomas Schäfer +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -288,6 +288,7 @@ static void option_instat_callback(struc + #define ALCATEL_VENDOR_ID 0x1bbb + #define ALCATEL_PRODUCT_X060S_X200 0x0000 + #define ALCATEL_PRODUCT_X220_X500D 0x0017 ++#define ALCATEL_PRODUCT_L100V 0x011e + + #define PIRELLI_VENDOR_ID 0x1266 + #define PIRELLI_PRODUCT_C100_1 0x1002 +@@ -1198,6 +1199,8 @@ static const struct usb_device_id option + .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist + }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, ++ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), diff --git a/queue-3.0/usb-option-blacklist-network-interface-on-zte-mf880.patch b/queue-3.0/usb-option-blacklist-network-interface-on-zte-mf880.patch new file mode 100644 index 00000000000..78b4f030be2 --- /dev/null +++ b/queue-3.0/usb-option-blacklist-network-interface-on-zte-mf880.patch @@ -0,0 +1,37 @@ +From fab38246f318edcd0dcb8fd3852a47cf8938878a Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Wed, 19 Dec 2012 15:15:17 +0100 +Subject: USB: option: blacklist network interface on ZTE MF880 + +From: Bjørn Mork + +commit fab38246f318edcd0dcb8fd3852a47cf8938878a upstream. + +The driver description files gives these names to the vendor specific +functions on this modem: + + diag: VID_19D2&PID_0284&MI_00 + nmea: VID_19D2&PID_0284&MI_01 + at: VID_19D2&PID_0284&MI_02 + mdm: VID_19D2&PID_0284&MI_03 + net: VID_19D2&PID_0284&MI_04 + +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -927,7 +927,8 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) }, +- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */ ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, -- 2.47.3