From: Greg Kroah-Hartman Date: Thu, 27 Sep 2012 17:32:34 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.44~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa5229b205386133606153f7abe473abb20f7e26;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: bluetooth-add-support-for-apple-vendor-specific-devices.patch bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch bluetooth-use-usb_vendor_and_interface-for-broadcom-devices.patch --- diff --git a/queue-3.0/bluetooth-add-support-for-apple-vendor-specific-devices.patch b/queue-3.0/bluetooth-add-support-for-apple-vendor-specific-devices.patch new file mode 100644 index 00000000000..a4d0c5b7736 --- /dev/null +++ b/queue-3.0/bluetooth-add-support-for-apple-vendor-specific-devices.patch @@ -0,0 +1,39 @@ +From 1fa6535faf055cd71311ab887e94fc234f04ee18 Mon Sep 17 00:00:00 2001 +From: Henrik Rydberg +Date: Sat, 25 Aug 2012 19:28:06 +0200 +Subject: Bluetooth: Add support for Apple vendor-specific devices + +From: Henrik Rydberg + +commit 1fa6535faf055cd71311ab887e94fc234f04ee18 upstream. + +As pointed out by Gustavo and Marcel, all Apple-specific Broadcom +devices seen so far have the same interface class, subclass and +protocol numbers. This patch adds an entry which matches all of them, +using the new USB_VENDOR_AND_INTERFACE_INFO() macro. + +In particular, this patch adds support for the MacBook Pro Retina +(05ac:8286), which is not in the present list. + +Signed-off-by: Henrik Rydberg +Tested-by: Shea Levy +Acked-by: Marcel Holtmann +Signed-off-by: Gustavo Padovan +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/btusb.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -60,6 +60,9 @@ static struct usb_device_id btusb_table[ + /* Generic Bluetooth USB device */ + { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, + ++ /* Apple-specific (Broadcom) devices */ ++ { USB_VENDOR_AND_INTERFACE_INFO(0x05ac, 0xff, 0x01, 0x01) }, ++ + /* Broadcom SoftSailing reporting vendor specific */ + { USB_DEVICE(0x0a5c, 0x21e1) }, + diff --git a/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch new file mode 100644 index 00000000000..48127676663 --- /dev/null +++ b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch @@ -0,0 +1,56 @@ +From 61c964ba1748e984cb232b431582815899bf10fe Mon Sep 17 00:00:00 2001 +From: Manoj Iyer +Date: Tue, 10 Jul 2012 14:07:38 -0500 +Subject: Bluetooth: btusb: Add vendor specific ID (0a5c:21f4) BCM20702A0 + +From: Manoj Iyer + +commit 61c964ba1748e984cb232b431582815899bf10fe upstream. + +Patch adds support for BCM20702A0 device id (0a5c:21f4). + +usb-devices after patch was applied: +T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21f4 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=E4D53DF154D6 +C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA +I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb +I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb +I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) +I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) + +usb-devices before patch was applied: +T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21f4 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=E4D53DF154D6 +C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=0mA +I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) +I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) +I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) +I: If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) + +Signed-off-by: Manoj Iyer +Tested-by: Chris Gagnon +Signed-off-by: Gustavo Padovan +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/btusb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -106,6 +106,7 @@ static struct usb_device_id btusb_table[ + { USB_DEVICE(0x0a5c, 0x21e6) }, + { USB_DEVICE(0x0a5c, 0x21e8) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, ++ { USB_DEVICE(0x0a5c, 0x21f4) }, + { USB_DEVICE(0x413c, 0x8197) }, + + /* Foxconn - Hon Hai */ diff --git a/queue-3.0/bluetooth-use-usb_vendor_and_interface-for-broadcom-devices.patch b/queue-3.0/bluetooth-use-usb_vendor_and_interface-for-broadcom-devices.patch new file mode 100644 index 00000000000..7344383ef62 --- /dev/null +++ b/queue-3.0/bluetooth-use-usb_vendor_and_interface-for-broadcom-devices.patch @@ -0,0 +1,44 @@ +From 92c385f46b30f4954e9dd2d2005c12d233b479ea Mon Sep 17 00:00:00 2001 +From: Gustavo Padovan +Date: Mon, 6 Aug 2012 15:36:49 -0300 +Subject: Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices + +From: Gustavo Padovan + +commit 92c385f46b30f4954e9dd2d2005c12d233b479ea upstream. + +Many Broadcom devices has a vendor specific devices class, with this rule +we match all existent and future controllers with this behavior. + +We also remove old rules to that matches product id for Broadcom devices. + +Tested-by: John Hommel +Signed-off-by: Gustavo Padovan +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/btusb.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -102,16 +102,14 @@ static struct usb_device_id btusb_table[ + + /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0489, 0xe042) }, +- { USB_DEVICE(0x0a5c, 0x21e3) }, +- { USB_DEVICE(0x0a5c, 0x21e6) }, +- { USB_DEVICE(0x0a5c, 0x21e8) }, +- { USB_DEVICE(0x0a5c, 0x21f3) }, +- { USB_DEVICE(0x0a5c, 0x21f4) }, + { USB_DEVICE(0x413c, 0x8197) }, + + /* Foxconn - Hon Hai */ + { USB_DEVICE(0x0489, 0xe033) }, + ++ /*Broadcom devices with vendor specific id */ ++ { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, ++ + { } /* Terminating entry */ + }; + diff --git a/queue-3.0/series b/queue-3.0/series index d1571a77353..7024c627f5b 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -95,3 +95,6 @@ drm-i915-hdmi-clear-audio-enable-bit-for-hot-plug.patch md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch workqueue-unbound-rebind-morphing-in-rebind_workers-should-be-atomic.patch x86-fix-boot-on-twinhead-h12y.patch +bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch +bluetooth-use-usb_vendor_and_interface-for-broadcom-devices.patch +bluetooth-add-support-for-apple-vendor-specific-devices.patch