aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2012-04-19 02:53:45 -0400
committerMarcel Holtmann <marcel@holtmann.org>2012-04-19 05:14:06 -0400
commitac71311e65e2c4c2dbac76db698fecbee755b016 (patch)
tree5a71c3464c7c3a601765a388b2792d3a9346bf40 /drivers/bluetooth
parent6ec5bcadc21e13ceba8c144e4731eccac01d04f7 (diff)
Bluetooth: Add support for AR3012 [0cf3:e004]
Add another vendor specific ID for Atheros AR3012 output of usb-devices: T: Bus=02 Lev=02 Prnt=02 Port=04 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=e004 Rev=00.02 S: Manufacturer=Atheros Communications S: Product=Bluetooth USB Host Controller S: SerialNumber=Alaska Day 2006 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 BugLink: https://bugs.launchpad.net/bugs/922715 Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-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 639a1616402f..57fd867553d7 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -76,6 +76,7 @@ static struct usb_device_id ath3k_table[] = {
76 { USB_DEVICE(0x13d3, 0x3375) }, 76 { USB_DEVICE(0x13d3, 0x3375) },
77 { USB_DEVICE(0x04CA, 0x3005) }, 77 { USB_DEVICE(0x04CA, 0x3005) },
78 { USB_DEVICE(0x13d3, 0x3362) }, 78 { USB_DEVICE(0x13d3, 0x3362) },
79 { USB_DEVICE(0x0CF3, 0xE004) },
79 80
80 /* Atheros AR5BBU12 with sflash firmware */ 81 /* Atheros AR5BBU12 with sflash firmware */
81 { USB_DEVICE(0x0489, 0xE02C) }, 82 { USB_DEVICE(0x0489, 0xE02C) },
@@ -96,6 +97,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
96 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, 97 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
97 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, 98 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
98 { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, 99 { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
100 { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
99 101
100 { } /* Terminating entry */ 102 { } /* Terminating entry */
101}; 103};
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a497544a87e8..93cc828298c4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -135,6 +135,7 @@ static struct usb_device_id blacklist_table[] = {
135 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, 135 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
136 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, 136 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
137 { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, 137 { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
138 { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
138 139
139 /* Atheros AR5BBU12 with sflash firmware */ 140 /* Atheros AR5BBU12 with sflash firmware */
140 { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, 141 { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },