]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Apr 2015 09:50:29 +0000 (11:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Apr 2015 09:50:29 +0000 (11:50 +0200)
added patches:
add-a-new-pid-vid-0227-0930-for-ar3012.patch
bluetooth-add-firmware-update-for-atheros-0cf3-311f.patch
bluetooth-add-support-for-acer-2.patch
bluetooth-add-support-for-acer.patch
bluetooth-add-support-for-broadcom-device-of-asus-z97-deluxe-motherboard.patch
bluetooth-add-support-for-intel-bootloader-devices.patch
bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch
bluetooth-append-new-supported-device-to-the-list.patch
bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch
bluetooth-btusb-add-imc-networks-broadcom-based.patch
bluetooth-enable-atheros-0cf3-311e-for-firmware-upload.patch
bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch
bluetooth-sort-the-list-of-ids-in-the-source-code.patch

14 files changed:
queue-3.14/add-a-new-pid-vid-0227-0930-for-ar3012.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-firmware-update-for-atheros-0cf3-311f.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-support-for-acer-2.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-support-for-acer.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-support-for-broadcom-device-of-asus-z97-deluxe-motherboard.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-support-for-intel-bootloader-devices.patch [new file with mode: 0644]
queue-3.14/bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch [new file with mode: 0644]
queue-3.14/bluetooth-append-new-supported-device-to-the-list.patch [new file with mode: 0644]
queue-3.14/bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch [new file with mode: 0644]
queue-3.14/bluetooth-btusb-add-imc-networks-broadcom-based.patch [new file with mode: 0644]
queue-3.14/bluetooth-enable-atheros-0cf3-311e-for-firmware-upload.patch [new file with mode: 0644]
queue-3.14/bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch [new file with mode: 0644]
queue-3.14/bluetooth-sort-the-list-of-ids-in-the-source-code.patch [new file with mode: 0644]
queue-3.14/series

diff --git a/queue-3.14/add-a-new-pid-vid-0227-0930-for-ar3012.patch b/queue-3.14/add-a-new-pid-vid-0227-0930-for-ar3012.patch
new file mode 100644 (file)
index 0000000..160227c
--- /dev/null
@@ -0,0 +1,76 @@
+From 89d2975fa06e66ea0d3665d91f799fb1ce4b8bad Mon Sep 17 00:00:00 2001
+From: Vincent Zwanenburg <vincentz@topmail.ie>
+Date: Fri, 8 Aug 2014 12:33:56 +0100
+Subject: Add a new PID/VID 0227/0930 for AR3012.
+
+From: Vincent Zwanenburg <vincentz@topmail.ie>
+
+commit 89d2975fa06e66ea0d3665d91f799fb1ce4b8bad upstream.
+
+usb devices info:
+
+T:  Bus=01 Lev=02 Prnt=05 Port=00 Cnt=01 Dev#= 20 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0930 ProdID=0227 Rev= 0.02
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+A:  FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+Signed-off-by: Vincent Zwanenburg <vincentz@topmail.ie>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04CA, 0x300b) },
+       { USB_DEVICE(0x0930, 0x0219) },
+       { USB_DEVICE(0x0930, 0x0220) },
++      { USB_DEVICE(0x0930, 0x0227) },
+       { USB_DEVICE(0x0b05, 0x17d0) },
+       { USB_DEVICE(0x0CF3, 0x0036) },
+       { USB_DEVICE(0x0CF3, 0x3004) },
+@@ -137,6 +138,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -165,6 +165,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-add-firmware-update-for-atheros-0cf3-311f.patch b/queue-3.14/bluetooth-add-firmware-update-for-atheros-0cf3-311f.patch
new file mode 100644 (file)
index 0000000..7f46698
--- /dev/null
@@ -0,0 +1,64 @@
+From 1e56f1eb2bbeab0ddc3a1e536d2a0065cfe4c131 Mon Sep 17 00:00:00 2001
+From: Oliver Neukum <oliver@neukum.org>
+Date: Thu, 16 Jan 2014 16:02:58 +0100
+Subject: Bluetooth: Add firmware update for Atheros 0cf3:311f
+
+From: Oliver Neukum <oliver@neukum.org>
+
+commit 1e56f1eb2bbeab0ddc3a1e536d2a0065cfe4c131 upstream.
+
+The device is not functional without firmware.
+
+The device without firmware:
+T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0cf3 ProdID=311f Rev=00.01
+C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+The device with firmware:
+T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  4 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0cf3 ProdID=3007 Rev=00.01
+C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -78,6 +78,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0CF3, 0x3008) },
+       { USB_DEVICE(0x0CF3, 0x311D) },
+       { USB_DEVICE(0x0CF3, 0x311E) },
++      { USB_DEVICE(0x0CF3, 0x311F) },
+       { USB_DEVICE(0x0CF3, 0x817a) },
+       { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x04CA, 0x3004) },
+@@ -125,6 +126,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -145,6 +145,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-add-support-for-acer-2.patch b/queue-3.14/bluetooth-add-support-for-acer-2.patch
new file mode 100644 (file)
index 0000000..bd07cdb
--- /dev/null
@@ -0,0 +1,55 @@
+From 4b552bc9edfdc947862af225a0e2521edb5d37a0 Mon Sep 17 00:00:00 2001
+From: Anantha Krishnan <ananthk@codeaurora.org>
+Date: Mon, 6 Oct 2014 16:31:49 +0530
+Subject: Bluetooth: Add support for Acer [0489:e078]
+
+From: Anantha Krishnan <ananthk@codeaurora.org>
+
+commit 4b552bc9edfdc947862af225a0e2521edb5d37a0 upstream.
+
+Add support for the QCA6174 chip.
+
+    T:  Bus=06 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  3 Spd=12  MxCh= 0
+    D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+    P:  Vendor=0489 ProdID=e078 Rev=00.01
+    C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+    I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+    I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+Signed-off-by: Anantha Krishnan <ananthk@codeaurora.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -78,6 +78,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0489, 0xe057) },
+       { USB_DEVICE(0x0489, 0xe056) },
+       { USB_DEVICE(0x0489, 0xe05f) },
++      { USB_DEVICE(0x0489, 0xe078) },
+       { USB_DEVICE(0x04c5, 0x1330) },
+       { USB_DEVICE(0x04CA, 0x3004) },
+       { USB_DEVICE(0x04CA, 0x3005) },
+@@ -129,6 +130,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -156,6 +156,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-add-support-for-acer.patch b/queue-3.14/bluetooth-add-support-for-acer.patch
new file mode 100644 (file)
index 0000000..62157e1
--- /dev/null
@@ -0,0 +1,55 @@
+From fa2f1394fe9c1a217213f02df77812701de6362f Mon Sep 17 00:00:00 2001
+From: Anantha Krishnan <ananthk@codeaurora.org>
+Date: Tue, 8 Jul 2014 19:25:08 +0530
+Subject: Bluetooth: Add support for Acer [13D3:3432]
+
+From: Anantha Krishnan <ananthk@codeaurora.org>
+
+commit fa2f1394fe9c1a217213f02df77812701de6362f upstream.
+
+Add support for the QCA6174 chip.
+
+    T:  Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 30 Spd=12  MxCh= 0
+    D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+    P:  Vendor=13d3 ProdID=3432 Rev=00.02
+    C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+    I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+    I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+Signed-off-by: Anantha Krishnan <ananthk@codeaurora.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -103,6 +103,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x13d3, 0x3393) },
+       { USB_DEVICE(0x13d3, 0x3402) },
++      { USB_DEVICE(0x13d3, 0x3432) },
+       /* Atheros AR5BBU12 with sflash firmware */
+       { USB_DEVICE(0x0489, 0xE02C) },
+@@ -152,6 +153,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU22 with sflash firmware */
+       { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -178,6 +178,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU12 with sflash firmware */
+       { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
diff --git a/queue-3.14/bluetooth-add-support-for-broadcom-device-of-asus-z97-deluxe-motherboard.patch b/queue-3.14/bluetooth-add-support-for-broadcom-device-of-asus-z97-deluxe-motherboard.patch
new file mode 100644 (file)
index 0000000..125f9c6
--- /dev/null
@@ -0,0 +1,68 @@
+From c2aef6e8cbebd60f79555baeb9266e220f135a44 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Mon, 21 Jul 2014 14:02:33 +0200
+Subject: Bluetooth: Add support for Broadcom device of Asus Z97-DELUXE motherboard
+
+From: Marcel Holtmann <marcel@holtmann.org>
+
+commit c2aef6e8cbebd60f79555baeb9266e220f135a44 upstream.
+
+The Asus Z97-DELUXE motherboard contains a Broadcom based Bluetooth
+controller on the USB bus. However vendor and product ID are listed
+as ASUSTek Computer.
+
+T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  3 Spd=12   MxCh= 0
+D:  Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0b05 ProdID=17cf Rev= 1.12
+S:  Manufacturer=Broadcom Corp
+S:  Product=BCM20702A0
+S:  SerialNumber=54271E910064
+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
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
+E:  Ad=84(I) Atr=02(Bulk) MxPS=  32 Ivl=0ms
+E:  Ad=04(O) Atr=02(Bulk) MxPS=  32 Ivl=0ms
+I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
+
+Reported-by: Jerome Leclanche <jerome@leclan.ch>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -114,6 +114,9 @@ static const struct usb_device_id btusb_
+       /* Broadcom devices with vendor specific id */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
++      /* ASUSTek Computer - Broadcom based */
++      { USB_VENDOR_AND_INTERFACE_INFO(0x0b05, 0xff, 0x01, 0x01) },
++
+       /* Belkin F8065bf - Broadcom based */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },
diff --git a/queue-3.14/bluetooth-add-support-for-intel-bootloader-devices.patch b/queue-3.14/bluetooth-add-support-for-intel-bootloader-devices.patch
new file mode 100644 (file)
index 0000000..016d313
--- /dev/null
@@ -0,0 +1,82 @@
+From 40df783d1ef1989ac454e3dfcda017270b8950e6 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Sun, 6 Jul 2014 13:29:58 +0200
+Subject: Bluetooth: Add support for Intel bootloader devices
+
+From: Marcel Holtmann <marcel@holtmann.org>
+
+commit 40df783d1ef1989ac454e3dfcda017270b8950e6 upstream.
+
+Intel Bluetooth devices that boot up in bootloader mode can not
+be used as generic HCI devices, but their HCI transport is still
+valuable and so bring that up as raw-only devices.
+
+T:  Bus=02 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 14 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=ff(vend.) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
+P:  Vendor=8087 ProdID=0a5a Rev= 0.00
+S:  Manufacturer=Intel(R) Corporation
+S:  Product=Intel(R) Wilkins Peak 2x2
+S:  SerialNumber=001122334455 WP_A0
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=81(I) Atr=03(Int.) MxPS=  64 Ivl=1ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+[bwh: Backported to 3.14: adjust context]
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/bluetooth/btusb.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -49,6 +49,7 @@ static struct usb_driver btusb_driver;
+ #define BTUSB_WRONG_SCO_MTU   0x40
+ #define BTUSB_ATH3012         0x80
+ #define BTUSB_INTEL           0x100
++#define BTUSB_INTEL_BOOT      0x200
+ static const struct usb_device_id btusb_table[] = {
+       /* Generic Bluetooth USB device */
+@@ -119,6 +120,9 @@ static const struct usb_device_id btusb_
+       /* IMC Networks - Broadcom based */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },
++      /* Intel Bluetooth USB Bootloader (RAM module) */
++      { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT },
++
+       { }     /* Terminating entry */
+ };
+@@ -1497,6 +1501,9 @@ static int btusb_probe(struct usb_interf
+       if (id->driver_info & BTUSB_INTEL)
+               hdev->setup = btusb_setup_intel;
++      if (id->driver_info & BTUSB_INTEL_BOOT)
++              set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
++
+       /* Interface numbers are hardcoded in the specification */
+       data->isoc = usb_ifnum_to_if(data->udev, 1);
diff --git a/queue-3.14/bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch b/queue-3.14/bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch
new file mode 100644 (file)
index 0000000..09484db
--- /dev/null
@@ -0,0 +1,79 @@
+From 134d3b3550f050b9bec37111824452064d1ed928 Mon Sep 17 00:00:00 2001
+From: Janne Heikkinen <janne.m.heikkinen@gmail.com>
+Date: Tue, 9 Dec 2014 07:44:51 +0200
+Subject: Bluetooth: Add USB device 04ca:3010 as Atheros AR3012
+
+From: Janne Heikkinen <janne.m.heikkinen@gmail.com>
+
+commit 134d3b3550f050b9bec37111824452064d1ed928 upstream.
+
+Asus X553MA has USB device 04ca:3010 that is Atheros AR3012
+or compatible.
+
+Device from /sys/kernel/debug/usb/devices:
+
+T:  Bus=01 Lev=02 Prnt=02 Port=03 Cnt=02 Dev#= 27 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=04ca ProdID=3010 Rev= 0.02
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+A:  FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+Signed-off-by: Janne Heikkinen <janne.m.heikkinen@gmail.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -86,6 +86,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04CA, 0x3007) },
+       { USB_DEVICE(0x04CA, 0x3008) },
+       { USB_DEVICE(0x04CA, 0x300b) },
++      { USB_DEVICE(0x04CA, 0x3010) },
+       { USB_DEVICE(0x0930, 0x0219) },
+       { USB_DEVICE(0x0930, 0x0220) },
+       { USB_DEVICE(0x0930, 0x0227) },
+@@ -139,6 +140,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -164,6 +164,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-append-new-supported-device-to-the-list.patch b/queue-3.14/bluetooth-append-new-supported-device-to-the-list.patch
new file mode 100644 (file)
index 0000000..eb47c26
--- /dev/null
@@ -0,0 +1,56 @@
+From a735f9e22432899cee188d167966782c29246390 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Tue, 18 Feb 2014 18:26:20 +0200
+Subject: Bluetooth: append new supported device to the list [0b05:17d0]
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit a735f9e22432899cee188d167966782c29246390 upstream.
+
+The device found on Asus Z87 Expert motherboard requires firmware to work
+correctly.
+
+T:  Bus=03 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#=  3 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0b05 ProdID=17d0 Rev=00.02
+C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04CA, 0x300b) },
+       { USB_DEVICE(0x0930, 0x0219) },
+       { USB_DEVICE(0x0930, 0x0220) },
++      { USB_DEVICE(0x0b05, 0x17d0) },
+       { USB_DEVICE(0x0CF3, 0x0036) },
+       { USB_DEVICE(0x0CF3, 0x3004) },
+       { USB_DEVICE(0x0CF3, 0x3008) },
+@@ -135,6 +136,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -157,6 +157,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch b/queue-3.14/bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch
new file mode 100644 (file)
index 0000000..1dcce9d
--- /dev/null
@@ -0,0 +1,77 @@
+From 3bb30a7cdf9242aca90d49aa41baebf9458f96f0 Mon Sep 17 00:00:00 2001
+From: Dmitry Tunin <hanipouspilot@gmail.com>
+Date: Tue, 25 Nov 2014 20:19:52 +0300
+Subject: Bluetooth: ath3k: Add support of MCI 13d3:3408 bt device
+
+From: Dmitry Tunin <hanipouspilot@gmail.com>
+
+commit 3bb30a7cdf9242aca90d49aa41baebf9458f96f0 upstream.
+
+Add support for Bluetooth MCI WB335 (AR9565) Wi-Fi+bt module. This
+Bluetooth module requires loading patch and sysconfig by ath3k driver.
+
+T:  Bus=01 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 20 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=13d3 ProdID=3408 Rev= 0.02
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+A:  FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -105,6 +105,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x13d3, 0x3393) },
+       { USB_DEVICE(0x13d3, 0x3402) },
++      { USB_DEVICE(0x13d3, 0x3408) },
+       { USB_DEVICE(0x13d3, 0x3432) },
+       /* Atheros AR5BBU12 with sflash firmware */
+@@ -157,6 +158,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU22 with sflash firmware */
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -183,6 +183,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU12 with sflash firmware */
diff --git a/queue-3.14/bluetooth-btusb-add-imc-networks-broadcom-based.patch b/queue-3.14/bluetooth-btusb-add-imc-networks-broadcom-based.patch
new file mode 100644 (file)
index 0000000..d9f7308
--- /dev/null
@@ -0,0 +1,67 @@
+From 9113bfd82dc8ece9cbb898df8794f58a78a36e97 Mon Sep 17 00:00:00 2001
+From: Jurgen Kramer <gtmkramer@xs4all.nl>
+Date: Sat, 15 Feb 2014 12:01:09 +0100
+Subject: Bluetooth: btusb: Add IMC Networks (Broadcom based)
+
+From: Jurgen Kramer <gtmkramer@xs4all.nl>
+
+commit 9113bfd82dc8ece9cbb898df8794f58a78a36e97 upstream.
+
+Add support for IMC Networks (Broadcom based) to btusb driver.
+
+Below the output of /sys/kernel/debug/usb/devices for this device:
+
+T:  Bus=01 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=13d3 ProdID=3404 Rev= 1.12
+S:  Manufacturer=Broadcom Corp
+S:  Product=BCM20702A0
+S:  SerialNumber=240A649F8246
+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
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
+E:  Ad=84(I) Atr=02(Bulk) MxPS=  32 Ivl=0ms
+E:  Ad=04(O) Atr=02(Bulk) MxPS=  32 Ivl=0ms
+I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none)
+
+Signed-off-by: Jurgen Kramer <gtmkramer@xs4all.nl>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -116,6 +116,9 @@ static const struct usb_device_id btusb_
+       /* Belkin F8065bf - Broadcom based */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },
++      /* IMC Networks - Broadcom based */
++      { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },
++
+       { }     /* Terminating entry */
+ };
diff --git a/queue-3.14/bluetooth-enable-atheros-0cf3-311e-for-firmware-upload.patch b/queue-3.14/bluetooth-enable-atheros-0cf3-311e-for-firmware-upload.patch
new file mode 100644 (file)
index 0000000..7852dff
--- /dev/null
@@ -0,0 +1,105 @@
+From b131237ca3995edad9efc162d0bc959c3b1dddc2 Mon Sep 17 00:00:00 2001
+From: Oliver Neukum <oliver@neukum.org>
+Date: Thu, 16 Jan 2014 15:37:11 +0100
+Subject: Bluetooth: Enable Atheros 0cf3:311e for firmware upload
+
+From: Oliver Neukum <oliver@neukum.org>
+
+commit b131237ca3995edad9efc162d0bc959c3b1dddc2 upstream.
+
+The device will bind to btusb without firmware, but with the original
+buggy firmware device discovery does not work. No devices are detected.
+
+Device descriptor without firmware:
+T:  Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#=  2 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0cf3 ProdID=311e Rev= 0.01
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+with firmware:
+T:  Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#=  3 Spd=12   MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=0cf3 ProdID=311e Rev= 0.02
+C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
+E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
+I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
+I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
+I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
+I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
+I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
+I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |    2 ++
+ drivers/bluetooth/btusb.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -77,6 +77,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0CF3, 0x3004) },
+       { USB_DEVICE(0x0CF3, 0x3008) },
+       { USB_DEVICE(0x0CF3, 0x311D) },
++      { USB_DEVICE(0x0CF3, 0x311E) },
+       { USB_DEVICE(0x0CF3, 0x817a) },
+       { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x04CA, 0x3004) },
+@@ -123,6 +124,7 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -144,6 +144,7 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
diff --git a/queue-3.14/bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch b/queue-3.14/bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch
new file mode 100644 (file)
index 0000000..c37de9c
--- /dev/null
@@ -0,0 +1,33 @@
+From d92f2df0565ea04101d6ac04bdc10feeb1d93c94 Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann <marcel@holtmann.org>
+Date: Sun, 6 Jul 2014 14:53:55 +0200
+Subject: Bluetooth: Ignore isochronous endpoints for Intel USB bootloader
+
+From: Marcel Holtmann <marcel@holtmann.org>
+
+commit d92f2df0565ea04101d6ac04bdc10feeb1d93c94 upstream.
+
+The isochronous endpoints are not valid when the Intel Bluetooth
+controller boots up in bootloader mode. So just mark these endpoints
+as broken and then they will not be configured.
+
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/btusb.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -121,7 +121,8 @@ static const struct usb_device_id btusb_
+       { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },
+       /* Intel Bluetooth USB Bootloader (RAM module) */
+-      { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT },
++      { USB_DEVICE(0x8087, 0x0a5a),
++        .driver_info = BTUSB_INTEL_BOOT | BTUSB_BROKEN_ISOC },
+       { }     /* Terminating entry */
+ };
diff --git a/queue-3.14/bluetooth-sort-the-list-of-ids-in-the-source-code.patch b/queue-3.14/bluetooth-sort-the-list-of-ids-in-the-source-code.patch
new file mode 100644 (file)
index 0000000..cf7e7a1
--- /dev/null
@@ -0,0 +1,267 @@
+From 0b8800623d3f12dd40a039aa191d52bfa4eef5b4 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Tue, 18 Feb 2014 18:26:19 +0200
+Subject: Bluetooth: sort the list of IDs in the source code
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit 0b8800623d3f12dd40a039aa191d52bfa4eef5b4 upstream.
+
+This will help to manage table of supported IDs.
+
+There is no functional change.
+
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+[bwh: Backported to 3.14: sort 04ca:3007 which was added after this upstream
+ but already added here]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/bluetooth/ath3k.c |   82 +++++++++++++++++++++++-----------------------
+ drivers/bluetooth/btusb.c |   54 +++++++++++++++---------------
+ 2 files changed, 68 insertions(+), 68 deletions(-)
+
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -62,53 +62,53 @@ static const struct usb_device_id ath3k_
+       { USB_DEVICE(0x0CF3, 0x3000) },
+       /* Atheros AR3011 with sflash firmware*/
++      { USB_DEVICE(0x0489, 0xE027) },
++      { USB_DEVICE(0x0489, 0xE03D) },
++      { USB_DEVICE(0x0930, 0x0215) },
+       { USB_DEVICE(0x0CF3, 0x3002) },
+       { USB_DEVICE(0x0CF3, 0xE019) },
+       { USB_DEVICE(0x13d3, 0x3304) },
+-      { USB_DEVICE(0x0930, 0x0215) },
+-      { USB_DEVICE(0x0489, 0xE03D) },
+-      { USB_DEVICE(0x0489, 0xE027) },
+       /* Atheros AR9285 Malbec with sflash firmware */
+       { USB_DEVICE(0x03F0, 0x311D) },
+       /* Atheros AR3012 with sflash firmware*/
++      { USB_DEVICE(0x0489, 0xe04d) },
++      { USB_DEVICE(0x0489, 0xe04e) },
++      { USB_DEVICE(0x0489, 0xe057) },
++      { USB_DEVICE(0x0489, 0xe056) },
++      { USB_DEVICE(0x0489, 0xe05f) },
++      { USB_DEVICE(0x04c5, 0x1330) },
++      { USB_DEVICE(0x04CA, 0x3004) },
++      { USB_DEVICE(0x04CA, 0x3005) },
++      { USB_DEVICE(0x04CA, 0x3006) },
++      { USB_DEVICE(0x04CA, 0x3007) },
++      { USB_DEVICE(0x04CA, 0x3008) },
++      { USB_DEVICE(0x04CA, 0x300b) },
++      { USB_DEVICE(0x0930, 0x0219) },
++      { USB_DEVICE(0x0930, 0x0220) },
+       { USB_DEVICE(0x0CF3, 0x0036) },
+       { USB_DEVICE(0x0CF3, 0x3004) },
+       { USB_DEVICE(0x0CF3, 0x3008) },
+       { USB_DEVICE(0x0CF3, 0x311D) },
+       { USB_DEVICE(0x0CF3, 0x311E) },
+       { USB_DEVICE(0x0CF3, 0x311F) },
++      { USB_DEVICE(0x0cf3, 0x3121) },
+       { USB_DEVICE(0x0CF3, 0x817a) },
+-      { USB_DEVICE(0x13d3, 0x3375) },
+-      { USB_DEVICE(0x04CA, 0x3004) },
+-      { USB_DEVICE(0x04CA, 0x3005) },
+-      { USB_DEVICE(0x04CA, 0x3006) },
+-      { USB_DEVICE(0x04CA, 0x3007) },
+-      { USB_DEVICE(0x04CA, 0x3008) },
+-      { USB_DEVICE(0x04CA, 0x300b) },
+-      { USB_DEVICE(0x13d3, 0x3362) },
++      { USB_DEVICE(0x0cf3, 0xe003) },
+       { USB_DEVICE(0x0CF3, 0xE004) },
+       { USB_DEVICE(0x0CF3, 0xE005) },
+-      { USB_DEVICE(0x0930, 0x0219) },
+-      { USB_DEVICE(0x0930, 0x0220) },
+-      { USB_DEVICE(0x0489, 0xe057) },
++      { USB_DEVICE(0x13d3, 0x3362) },
++      { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x13d3, 0x3393) },
+-      { USB_DEVICE(0x0489, 0xe04e) },
+-      { USB_DEVICE(0x0489, 0xe056) },
+-      { USB_DEVICE(0x0489, 0xe04d) },
+-      { USB_DEVICE(0x04c5, 0x1330) },
+       { USB_DEVICE(0x13d3, 0x3402) },
+-      { USB_DEVICE(0x0cf3, 0x3121) },
+-      { USB_DEVICE(0x0cf3, 0xe003) },
+-      { USB_DEVICE(0x0489, 0xe05f) },
+       /* Atheros AR5BBU12 with sflash firmware */
+       { USB_DEVICE(0x0489, 0xE02C) },
+       /* Atheros AR5BBU22 with sflash firmware */
+-      { USB_DEVICE(0x0489, 0xE03C) },
+       { USB_DEVICE(0x0489, 0xE036) },
++      { USB_DEVICE(0x0489, 0xE03C) },
+       { }     /* Terminating entry */
+ };
+@@ -121,39 +121,39 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);
+ static const struct usb_device_id ath3k_blist_tbl[] = {
+       /* Atheros AR3012 with sflash firmware*/
++      { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU22 with sflash firmware */
+-      { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
+       { }     /* Terminating entry */
+ };
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -101,16 +101,16 @@ static const struct usb_device_id btusb_
+       { USB_DEVICE(0x0c10, 0x0000) },
+       /* Broadcom BCM20702A0 */
++      { USB_DEVICE(0x0489, 0xe042) },
++      { USB_DEVICE(0x04ca, 0x2003) },
+       { USB_DEVICE(0x0b05, 0x17b5) },
+       { USB_DEVICE(0x0b05, 0x17cb) },
+-      { USB_DEVICE(0x04ca, 0x2003) },
+-      { USB_DEVICE(0x0489, 0xe042) },
+       { USB_DEVICE(0x413c, 0x8197) },
+       /* Foxconn - Hon Hai */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
+-      /*Broadcom devices with vendor specific id */
++      /* Broadcom devices with vendor specific id */
+       { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
+       /* Belkin F8065bf - Broadcom based */
+@@ -132,58 +132,58 @@ static const struct usb_device_id blackl
+       { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
+       /* Atheros 3011 with sflash firmware */
++      { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
++      { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
++      { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+       { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
+       { USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
+       { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
+-      { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+-      { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
+-      { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
+       /* Atheros AR9285 Malbec with sflash firmware */
+       { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
+       /* Atheros 3012 with sflash firmware */
++      { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
+-      { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
+       /* Atheros AR5BBU12 with sflash firmware */
+       { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
+       /* Atheros AR5BBU12 with sflash firmware */
+-      { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 },
++      { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
+       /* Broadcom BCM2035 */
+-      { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
+-      { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
+       { USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
++      { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
++      { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
+       /* Broadcom BCM2045 */
+       { USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_WRONG_SCO_MTU },
index 0b8c1cdf2c77d92e1ea38668206df542452d7960..9baf78a724e2372f4602aa892b643f33e997494f 100644 (file)
@@ -14,3 +14,16 @@ ixgb-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
 mlx4-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch
 benet-call-dev_kfree_skby_any-instead-of-kfree_skb.patch
 gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch
+bluetooth-enable-atheros-0cf3-311e-for-firmware-upload.patch
+bluetooth-add-firmware-update-for-atheros-0cf3-311f.patch
+bluetooth-btusb-add-imc-networks-broadcom-based.patch
+bluetooth-sort-the-list-of-ids-in-the-source-code.patch
+bluetooth-append-new-supported-device-to-the-list.patch
+bluetooth-add-support-for-intel-bootloader-devices.patch
+bluetooth-ignore-isochronous-endpoints-for-intel-usb-bootloader.patch
+bluetooth-add-support-for-acer.patch
+bluetooth-add-support-for-broadcom-device-of-asus-z97-deluxe-motherboard.patch
+add-a-new-pid-vid-0227-0930-for-ar3012.patch
+bluetooth-add-support-for-acer-2.patch
+bluetooth-ath3k-add-support-of-mci-13d3-3408-bt-device.patch
+bluetooth-add-usb-device-04ca-3010-as-atheros-ar3012.patch