aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2013-06-20 01:38:45 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-07-25 14:52:37 -0400
commit1d5b569ef85d013a775560a90050dc630614c045 (patch)
treeb7bf7fd5546860880ec3ebbd9af434cb0f24dd9c /drivers/bluetooth
parentfcee337704d76446e0d4714cc5eff53e896f7c6f (diff)
Bluetooth: Add support for Atheros [0cf3:e003]
Add support for the AR9462 chip 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=e003 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 Cc: Stable <stable@vger.kernel.org> Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
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 d3a2d6fafffb..a12b923bbaca 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -94,6 +94,7 @@ static struct usb_device_id ath3k_table[] = {
94 { USB_DEVICE(0x04c5, 0x1330) }, 94 { USB_DEVICE(0x04c5, 0x1330) },
95 { USB_DEVICE(0x13d3, 0x3402) }, 95 { USB_DEVICE(0x13d3, 0x3402) },
96 { USB_DEVICE(0x0cf3, 0x3121) }, 96 { USB_DEVICE(0x0cf3, 0x3121) },
97 { USB_DEVICE(0x0cf3, 0xe003) },
97 98
98 /* Atheros AR5BBU12 with sflash firmware */ 99 /* Atheros AR5BBU12 with sflash firmware */
99 { USB_DEVICE(0x0489, 0xE02C) }, 100 { USB_DEVICE(0x0489, 0xE02C) },
@@ -134,6 +135,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
134 { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, 135 { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
135 { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, 136 { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
136 { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, 137 { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
138 { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
137 139
138 /* Atheros AR5BBU22 with sflash firmware */ 140 /* Atheros AR5BBU22 with sflash firmware */
139 { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, 141 { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index fd5eaa30b52b..5fb06eca8d1f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -154,6 +154,7 @@ static struct usb_device_id blacklist_table[] = {
154 { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, 154 { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
155 { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, 155 { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
156 { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, 156 { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
157 { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
157 158
158 /* Atheros AR5BBU12 with sflash firmware */ 159 /* Atheros AR5BBU12 with sflash firmware */
159 { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, 160 { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },