From: Greg Kroah-Hartman Date: Fri, 1 Jun 2012 09:14:53 +0000 (+0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.34~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=148210a1716902d0bb053d79c2bd0d6c3265a455;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: bluetooth-add-support-for-bcm20702a0.patch bluetooth-add-support-for-broadcom-bcm20702a0.patch bluetooth-btusb-add-support-for-bcm20702a0.patch bluetooth-btusb-add-usb-device-id-0a5c-21e8.patch bluetooth-btusb-add-vendor-specific-id-0489-e042-for-bcm20702a0.patch bluetooth-btusb-add-vendor-specific-id-0a5c-21f3-for-bcm20702a0.patch --- diff --git a/queue-3.0/bluetooth-add-support-for-bcm20702a0.patch b/queue-3.0/bluetooth-add-support-for-bcm20702a0.patch new file mode 100644 index 00000000000..6d4fa7e9ec7 --- /dev/null +++ b/queue-3.0/bluetooth-add-support-for-bcm20702a0.patch @@ -0,0 +1,44 @@ +From c0190925dacd976a67044f4382d4effbed568dce Mon Sep 17 00:00:00 2001 +From: Jesse Sung +Date: Thu, 22 Dec 2011 10:48:47 +0800 +Subject: Bluetooth: Add support for BCM20702A0 [0a5c:21e3] + +From: Jesse Sung + +commit c0190925dacd976a67044f4382d4effbed568dce upstream. + +Add another vendor specific ID for BCM20702A0. + +output of usb-devices: +T: Bus=06 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21e3 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=9439E5CBF66C +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: Wen-chien Jesse Sung +Acked-by: Marcel Holtmann +Signed-off-by: Gustavo F. Padovan +Cc: Jonathan Nieder +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 +@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[ + { USB_DEVICE(0x0c10, 0x0000) }, + + /* Broadcom BCM20702A0 */ ++ { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x413c, 0x8197) }, + + { } /* Terminating entry */ diff --git a/queue-3.0/bluetooth-add-support-for-broadcom-bcm20702a0.patch b/queue-3.0/bluetooth-add-support-for-broadcom-bcm20702a0.patch new file mode 100644 index 00000000000..b668eeafd8b --- /dev/null +++ b/queue-3.0/bluetooth-add-support-for-broadcom-bcm20702a0.patch @@ -0,0 +1,47 @@ +From d13431ca3eb2a2c14314f04813cdc11cd869f150 Mon Sep 17 00:00:00 2001 +From: Wen-chien Jesse Sung +Date: Tue, 8 Nov 2011 14:30:22 +0800 +Subject: Bluetooth: Add support for Broadcom BCM20702A0 + +From: Wen-chien Jesse Sung + +commit d13431ca3eb2a2c14314f04813cdc11cd869f150 upstream. + +Since this device declares itself as vendor specific, must add +a new entry to device ID table to support it. + +usb-device output of this device: + +T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=413c ProdID=8197 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=D0DF9AA9C9F1 +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: Wen-chien Jesse Sung +Signed-off-by: Gustavo F. Padovan +Cc: Jonathan Nieder +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 +@@ -100,6 +100,9 @@ static struct usb_device_id btusb_table[ + /* Canyon CN-BTU1 with HID interfaces */ + { USB_DEVICE(0x0c10, 0x0000) }, + ++ /* Broadcom BCM20702A0 */ ++ { USB_DEVICE(0x413c, 0x8197) }, ++ + { } /* Terminating entry */ + }; + diff --git a/queue-3.0/bluetooth-btusb-add-support-for-bcm20702a0.patch b/queue-3.0/bluetooth-btusb-add-support-for-bcm20702a0.patch new file mode 100644 index 00000000000..ceb21a1fa4c --- /dev/null +++ b/queue-3.0/bluetooth-btusb-add-support-for-bcm20702a0.patch @@ -0,0 +1,46 @@ +From 0a4eaeeb993658a4d6cff054a863241f32d3d2fb Mon Sep 17 00:00:00 2001 +From: "James M. Leddy" +Date: Tue, 6 Mar 2012 02:41:33 +0200 +Subject: Bluetooth: btusb: add support for BCM20702A0 [0a5c:21e6] + +From: "James M. Leddy" + +commit 0a4eaeeb993658a4d6cff054a863241f32d3d2fb upstream. + +Add another vendor specific ID for BCM20702A0. This has been tested and +works on hardware with this device. + +output of usb-devices: +T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=04 Dev#= 6 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21e6 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=D0DF9AFB227B +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: James M. Leddy +Acked-by: Marcel Holtmann +Signed-off-by: Andrew Morton +Signed-off-by: Johan Hedberg +Cc: Jonathan Nieder +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 +@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[ + + /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0a5c, 0x21e3) }, ++ { USB_DEVICE(0x0a5c, 0x21e6) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, + { USB_DEVICE(0x413c, 0x8197) }, + diff --git a/queue-3.0/bluetooth-btusb-add-usb-device-id-0a5c-21e8.patch b/queue-3.0/bluetooth-btusb-add-usb-device-id-0a5c-21e8.patch new file mode 100644 index 00000000000..6a4b84e046a --- /dev/null +++ b/queue-3.0/bluetooth-btusb-add-usb-device-id-0a5c-21e8.patch @@ -0,0 +1,46 @@ +From 6dfc326f0605fd87e4c10ccde10de0ce4280d72d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= +Date: Wed, 14 Mar 2012 21:45:16 +0200 +Subject: Bluetooth: btusb: Add USB device ID "0a5c 21e8" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= + +commit 6dfc326f0605fd87e4c10ccde10de0ce4280d72d upstream. + +One more vendor-specific ID for BCM20702A0. + +T: Bus=01 Lev=03 Prnt=05 Port=02 Cnt=01 Dev#= 9 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21e8 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=00027221F4E2 +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: João Paulo Rechi Vita +Acked-by: Gustavo F. Padovan +Signed-off-by: Johan Hedberg +Cc: Jonathan Nieder +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 +@@ -103,6 +103,7 @@ static struct usb_device_id btusb_table[ + /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21e6) }, ++ { USB_DEVICE(0x0a5c, 0x21e8) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, + { USB_DEVICE(0x413c, 0x8197) }, + diff --git a/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0489-e042-for-bcm20702a0.patch b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0489-e042-for-bcm20702a0.patch new file mode 100644 index 00000000000..69e521a8d1b --- /dev/null +++ b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0489-e042-for-bcm20702a0.patch @@ -0,0 +1,41 @@ +From 79cd76022044f8177bb00e3fd590ec8d6b5f8c35 Mon Sep 17 00:00:00 2001 +From: Manoj Iyer +Date: Mon, 9 Apr 2012 09:22:28 -0500 +Subject: Bluetooth: btusb: Add vendor specific ID (0489 e042) for BCM20702A0 + +From: Manoj Iyer + +commit 79cd76022044f8177bb00e3fd590ec8d6b5f8c35 upstream. + +T: Bus=02 Lev=02 Prnt=02 Port=04 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0489 ProdID=e042 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=E4D53DCA61B5 +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) + +Reported-by: Dennis Chua +Signed-off-by: Manoj Iyer +Signed-off-by: Johan Hedberg +Cc: Jonathan Nieder +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 +@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[ + { USB_DEVICE(0x0c10, 0x0000) }, + + /* Broadcom BCM20702A0 */ ++ { USB_DEVICE(0x0489, 0xe042) }, + { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21e6) }, + { USB_DEVICE(0x0a5c, 0x21e8) }, diff --git a/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f3-for-bcm20702a0.patch b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f3-for-bcm20702a0.patch new file mode 100644 index 00000000000..882db7a9064 --- /dev/null +++ b/queue-3.0/bluetooth-btusb-add-vendor-specific-id-0a5c-21f3-for-bcm20702a0.patch @@ -0,0 +1,42 @@ +From 37305cf649689a4d2341dd6fd89b091c6007f9ba Mon Sep 17 00:00:00 2001 +From: Manoj Iyer +Date: Thu, 2 Feb 2012 09:32:36 -0600 +Subject: Bluetooth: btusb: Add vendor specific ID (0a5c 21f3) for BCM20702A0 + +From: Manoj Iyer + +commit 37305cf649689a4d2341dd6fd89b091c6007f9ba upstream. + +T: Bus=01 Lev=02 Prnt=02 Port=03 Cnt=03 Dev#= 5 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0a5c ProdID=21f3 Rev=01.12 +S: Manufacturer=Broadcom Corp +S: Product=BCM20702A0 +S: SerialNumber=74DE2B344A7B +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: Dennis Chua +Acked-by: Marcel Holtmann +Signed-off-by: Johan Hedberg +Cc: Jonathan Nieder +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 +@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[ + + /* Broadcom BCM20702A0 */ + { USB_DEVICE(0x0a5c, 0x21e3) }, ++ { USB_DEVICE(0x0a5c, 0x21f3) }, + { USB_DEVICE(0x413c, 0x8197) }, + + { } /* Terminating entry */ diff --git a/queue-3.0/series b/queue-3.0/series index 07cbd2557df..659a3d9f0bc 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -14,3 +14,9 @@ nfsv4-map-nfs4err_share_denied-into-an-eacces-error-instead-of-eio.patch drm-radeon-fix-xfx-quirk.patch drm-i915-properly-handle-interlaced-bit-for-sdvo-dtd-conversion.patch drm-i915-wait-for-a-vblank-to-pass-after-tv-detect.patch +bluetooth-add-support-for-broadcom-bcm20702a0.patch +bluetooth-add-support-for-bcm20702a0.patch +bluetooth-btusb-add-vendor-specific-id-0a5c-21f3-for-bcm20702a0.patch +bluetooth-btusb-add-support-for-bcm20702a0.patch +bluetooth-btusb-add-usb-device-id-0a5c-21e8.patch +bluetooth-btusb-add-vendor-specific-id-0489-e042-for-bcm20702a0.patch