From: Greg Kroah-Hartman Date: Wed, 1 May 2013 18:35:38 +0000 (-0700) Subject: 3.9-stable patches X-Git-Tag: v3.0.77~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02f101303c928ec26b5113c6bf499139ac7c470a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.9-stable patches added patches: usb-option-add-a-d-link-dwm-156-variant.patch usb-serial-option-added-support-olivetti-olicard-145.patch --- diff --git a/queue-3.9/series b/queue-3.9/series new file mode 100644 index 00000000000..451b06f0a0f --- /dev/null +++ b/queue-3.9/series @@ -0,0 +1,2 @@ +usb-serial-option-added-support-olivetti-olicard-145.patch +usb-option-add-a-d-link-dwm-156-variant.patch diff --git a/queue-3.9/usb-option-add-a-d-link-dwm-156-variant.patch b/queue-3.9/usb-option-add-a-d-link-dwm-156-variant.patch new file mode 100644 index 00000000000..6d7cd4634b6 --- /dev/null +++ b/queue-3.9/usb-option-add-a-d-link-dwm-156-variant.patch @@ -0,0 +1,69 @@ +From a2a2d6c7f93e160b52a4ad0164db1f43f743ae0f Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Tue, 9 Apr 2013 11:26:02 +0200 +Subject: USB: option: add a D-Link DWM-156 variant + +From: Bjørn Mork + +commit a2a2d6c7f93e160b52a4ad0164db1f43f743ae0f upstream. + +Adding support for a Mediatek based device labelled as +D-Link Model: DWM-156, H/W Ver: A7 + +Also adding two other device IDs found in the Debian(!) +packages included on the embedded device driver CD. + +This is a composite MBIM + serial ports + card reader device: + +T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 14 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=2001 ProdID=7d01 Rev= 3.00 +S: Manufacturer=D-Link,Inc +S: Product=D-Link DWM-156 +C:* #Ifs= 7 Cfg#= 1 Atr=a0 MxPwr=500mA +A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00 +I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim +E: Ad=88(I) Atr=03(Int.) MxPS= 64 Ivl=125us +I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=02 Prot=01 Driver=option +E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=500us +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 6 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1352,6 +1352,12 @@ static const struct usb_device_id option + { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x02, 0x01) }, /* D-Link DWM-156 (variant) */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x00, 0x00) }, /* D-Link DWM-156 (variant) */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x02, 0x01) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/queue-3.9/usb-serial-option-added-support-olivetti-olicard-145.patch b/queue-3.9/usb-serial-option-added-support-olivetti-olicard-145.patch new file mode 100644 index 00000000000..dc3350e4015 --- /dev/null +++ b/queue-3.9/usb-serial-option-added-support-olivetti-olicard-145.patch @@ -0,0 +1,36 @@ +From d19bf5cedfd7d53854a3bd699c98b467b139833b Mon Sep 17 00:00:00 2001 +From: Filippo Turato +Date: Sat, 20 Apr 2013 15:04:08 +0200 +Subject: USB: serial: option: Added support Olivetti Olicard 145 + +From: Filippo Turato + +commit d19bf5cedfd7d53854a3bd699c98b467b139833b upstream. + +This adds PID for Olivetti Olicard 145 in option.c + +Signed-off-by: Filippo Turato +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -347,6 +347,7 @@ static void option_instat_callback(struc + /* Olivetti products */ + #define OLIVETTI_VENDOR_ID 0x0b3c + #define OLIVETTI_PRODUCT_OLICARD100 0xc000 ++#define OLIVETTI_PRODUCT_OLICARD145 0xc003 + + /* Celot products */ + #define CELOT_VENDOR_ID 0x211f +@@ -1273,6 +1274,7 @@ static const struct usb_device_id option + { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, + + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) }, ++ { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) }, + { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */ + { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */ + { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/