aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Heikkinen <janne.m.heikkinen@gmail.com>2014-12-09 00:44:51 -0500
committerMarcel Holtmann <marcel@holtmann.org>2014-12-09 02:16:18 -0500
commit134d3b3550f050b9bec37111824452064d1ed928 (patch)
treebe6cfaa32b58d29af5b26cad51d2cb0e742378aa
parentfe7007719742e4c0c1255e2f45bdd4ed97afc369 (diff)
Bluetooth: Add USB device 04ca:3010 as Atheros AR3012
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>
-rw-r--r--drivers/bluetooth/ath3k.c2
-rw-r--r--drivers/bluetooth/btusb.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index fce758896280..1ee27ac18de0 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -87,6 +87,7 @@ static const struct usb_device_id ath3k_table[] = {
87 { USB_DEVICE(0x04CA, 0x3007) }, 87 { USB_DEVICE(0x04CA, 0x3007) },
88 { USB_DEVICE(0x04CA, 0x3008) }, 88 { USB_DEVICE(0x04CA, 0x3008) },
89 { USB_DEVICE(0x04CA, 0x300b) }, 89 { USB_DEVICE(0x04CA, 0x300b) },
90 { USB_DEVICE(0x04CA, 0x3010) },
90 { USB_DEVICE(0x0930, 0x0219) }, 91 { USB_DEVICE(0x0930, 0x0219) },
91 { USB_DEVICE(0x0930, 0x0220) }, 92 { USB_DEVICE(0x0930, 0x0220) },
92 { USB_DEVICE(0x0930, 0x0227) }, 93 { USB_DEVICE(0x0930, 0x0227) },
@@ -140,6 +141,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = {
140 { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, 141 { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
141 { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, 142 { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
142 { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, 143 { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
144 { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },
143 { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, 145 { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
144 { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, 146 { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
145 { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, 147 { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 31dd24ac9926..19cf2cf22e87 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -167,6 +167,7 @@ static const struct usb_device_id blacklist_table[] = {
167 { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, 167 { USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },
168 { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, 168 { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
169 { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, 169 { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
170 { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 },
170 { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, 171 { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
171 { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, 172 { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
172 { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, 173 { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 },