diff options
author | Eran <eran@over-here.org> | 2011-12-05 17:15:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-22 19:21:44 -0400 |
commit | 3c60ce957ce535a1cd709d95fa7743522a68a8f1 (patch) | |
tree | 50638c4d8eb06427709007bdddde2a309fcf93c2 | |
parent | a10d1f32dbf1b9f74b6b6ba1571ee3f7a1bd3883 (diff) |
Bluetooth: Adding USB device 13d3:3375 as an Atheros AR3012.
commit 9498ba7a1d38d42eef4ef6d906ab1743c9f0fd6f upstream.
The bluetooth module in the Asus UX31/UX21 is based on Atheros AR3012
and requires a firmware to be uploaded before it's usable.
output of usb-devices for this module:
T: Bus=01 Lev=02 Prnt=02 Port=07 Cnt=03 Dev#= 6 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=13d3 ProdID=3375 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
Signed-off-by: Eran <eran@over-here.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Cc: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/bluetooth/ath3k.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btusb.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 5c2a722095c..bad3657d107 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
@@ -71,6 +71,7 @@ static struct usb_device_id ath3k_table[] = { | |||
71 | 71 | ||
72 | /* Atheros AR3012 with sflash firmware*/ | 72 | /* Atheros AR3012 with sflash firmware*/ |
73 | { USB_DEVICE(0x0CF3, 0x3004) }, | 73 | { USB_DEVICE(0x0CF3, 0x3004) }, |
74 | { USB_DEVICE(0x13d3, 0x3375) }, | ||
74 | 75 | ||
75 | /* Atheros AR5BBU12 with sflash firmware */ | 76 | /* Atheros AR5BBU12 with sflash firmware */ |
76 | { USB_DEVICE(0x0489, 0xE02C) }, | 77 | { USB_DEVICE(0x0489, 0xE02C) }, |
@@ -87,6 +88,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { | |||
87 | 88 | ||
88 | /* Atheros AR3012 with sflash firmware*/ | 89 | /* Atheros AR3012 with sflash firmware*/ |
89 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, | 90 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, |
91 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | ||
90 | 92 | ||
91 | { } /* Terminating entry */ | 93 | { } /* Terminating entry */ |
92 | }; | 94 | }; |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 9f3a8b38454..f29b458b285 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -123,6 +123,7 @@ static struct usb_device_id blacklist_table[] = { | |||
123 | 123 | ||
124 | /* Atheros 3012 with sflash firmware */ | 124 | /* Atheros 3012 with sflash firmware */ |
125 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, | 125 | { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, |
126 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | ||
126 | 127 | ||
127 | /* Atheros AR5BBU12 with sflash firmware */ | 128 | /* Atheros AR5BBU12 with sflash firmware */ |
128 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, | 129 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, |