b510c6
From: Alexander Ploumistos <alex.ploumistos@gmail.com>
b510c6
Date: Fri, 13 Feb 2015 21:05:11 +0200
b510c6
Subject: [PATCH] Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe
b510c6
 card
b510c6
b510c6
Add 04f2:aff1 to ath3k.c supported devices list and btusb.c blacklist, so
b510c6
that the device can load the ath3k firmware and re-enumerate itself as an
b510c6
AR3011 device.
b510c6
b510c6
T:  Bus=05 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12   MxCh= 0
b510c6
D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
b510c6
P:  Vendor=04f2 ProdID=aff1 Rev= 0.01
b510c6
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
b510c6
I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
b510c6
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
b510c6
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
b510c6
I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
b510c6
I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
b510c6
I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
b510c6
I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
b510c6
I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
b510c6
I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
b510c6
E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
b510c6
E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
b510c6
b510c6
Signed-off-by: Alexander Ploumistos <alexpl@fedoraproject.org>
b510c6
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
b510c6
Cc: stable@vger.kernel.org
b510c6
---
b510c6
 drivers/bluetooth/ath3k.c | 1 +
b510c6
 drivers/bluetooth/btusb.c | 1 +
b510c6
 2 files changed, 2 insertions(+)
b510c6
b510c6
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
19bd16
index fe1678c4ff89..99e9d879a460 100644
b510c6
--- a/drivers/bluetooth/ath3k.c
b510c6
+++ b/drivers/bluetooth/ath3k.c
b510c6
@@ -65,6 +65,7 @@ static const struct usb_device_id ath3k_table[] = {
b510c6
 	/* Atheros AR3011 with sflash firmware*/
b510c6
 	{ USB_DEVICE(0x0489, 0xE027) },
b510c6
 	{ USB_DEVICE(0x0489, 0xE03D) },
b510c6
+	{ USB_DEVICE(0x04F2, 0xAFF1) },
b510c6
 	{ USB_DEVICE(0x0930, 0x0215) },
b510c6
 	{ USB_DEVICE(0x0CF3, 0x3002) },
b510c6
 	{ USB_DEVICE(0x0CF3, 0xE019) },
b510c6
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
19bd16
index f0e2f721c8ce..d8b5b37aa1bd 100644
b510c6
--- a/drivers/bluetooth/btusb.c
b510c6
+++ b/drivers/bluetooth/btusb.c
19bd16
@@ -150,6 +150,7 @@ static const struct usb_device_id blacklist_table[] = {
b510c6
 	/* Atheros 3011 with sflash firmware */
b510c6
 	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
b510c6
 	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
b510c6
+	{ USB_DEVICE(0x04f2, 0xaff1), .driver_info = BTUSB_IGNORE },
b510c6
 	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
b510c6
 	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
b510c6
 	{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
b510c6
-- 
b510c6
2.1.0
b510c6