[Acked] [PATCH] Bluetooth: Add support for Atheros [0cf3:3121]

[Andy Whitcroft]

On Tue, Aug 27, 2013 at 11:39:42AM +0800, AceLan Kao wrote:
> BugLink: http://bugs.launchpad.net/bugs/1202477
> 
> Add support for the AR3012 chip.
> 
> T:  Bus=03 Lev=01 Prnt=01 Port=06 Cnt=01 Dev#=  6 Spd=12  MxCh= 0
> D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
> P:  Vendor=0cf3 ProdID=3121 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
> 
> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> (backported from commit 1ebd0b21ab14efb75950079840eac29afea2a26e)
> 
> Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
> 
> Conflicts:
> 	drivers/bluetooth/ath3k.c
> 	drivers/bluetooth/btusb.c
> ---
>  drivers/bluetooth/ath3k.c | 2 ++
>  drivers/bluetooth/btusb.c | 1 +
>  2 files changed, 3 insertions(+)
> 
> diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
> index 8af01c1..47b0f70 100644
> --- a/drivers/bluetooth/ath3k.c
> +++ b/drivers/bluetooth/ath3k.c
> @@ -90,6 +90,7 @@ static struct usb_device_id ath3k_table[] = {
>  	{ USB_DEVICE(0x13d3, 0x3393) },
>  	{ USB_DEVICE(0x0489, 0xe04e) },
>  	{ USB_DEVICE(0x0489, 0xe056) },
> +	{ USB_DEVICE(0x0cf3, 0x3121) },
>  
>  	/* Atheros AR5BBU12 with sflash firmware */
>  	{ USB_DEVICE(0x0489, 0xE02C) },
> @@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
>  	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
>  	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
>  	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
> +	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
>  
>  	/* Atheros AR5BBU22 with sflash firmware */
>  	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index db16ce3..09fff25 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -166,6 +166,7 @@ static struct usb_device_id blacklist_table[] = {
>  	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
>  	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
>  	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
> +	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
>  
>  	/* Atheros AR5BBU12 with sflash firmware */
>  	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw