Bluetooth: btusb: Add support for 0489:e0a2 QCA_ROME device
diff mbox

Message ID 1498116330-21040-2-git-send-email-acelan.kao@canonical.com
State New
Headers show

Commit Message

AceLan Kao June 22, 2017, 7:25 a.m. UTC
From: "Shih-Yuan Lee (FourDollars)" <sylee@canonical.com>

T:  Bus=01 Lev=01 Prnt=01 Port=06 Cnt=03 Dev#=  3 Spd=12  MxCh= 0
D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=0489 ProdID=e0a2 Rev=00.01
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: Shih-Yuan Lee (FourDollars) <sylee@canonical.com>
Suggested-by: Owen Lin <olin@rivetnetworks.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
(cherry picked from commit 06e41d8a36689f465006f017bbcd8a73edb98109)
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 drivers/bluetooth/btusb.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Stefan Bader June 22, 2017, 8:09 a.m. UTC | #1
On 22.06.2017 09:25, AceLan Kao wrote:
> From: "Shih-Yuan Lee (FourDollars)" <sylee@canonical.com>
> 
> T:  Bus=01 Lev=01 Prnt=01 Port=06 Cnt=03 Dev#=  3 Spd=12  MxCh= 0
> D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
> P:  Vendor=0489 ProdID=e0a2 Rev=00.01
> 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: Shih-Yuan Lee (FourDollars) <sylee@canonical.com>
> Suggested-by: Owen Lin <olin@rivetnetworks.com>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> (cherry picked from commit 06e41d8a36689f465006f017bbcd8a73edb98109)
> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>

Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---

Needs BugLink added.

-Stefan

>  drivers/bluetooth/btusb.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 52db1e4..63a1865 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -256,6 +256,7 @@ static const struct usb_device_id blacklist_table[] = {
>  	{ USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },
>  	{ USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },
>  	{ USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },
> +	{ USB_DEVICE(0x0489, 0xe0a2), .driver_info = BTUSB_QCA_ROME },
>  	{ USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME },
>  
>  	/* Broadcom BCM2035 */
>
Seth Forshee June 22, 2017, 1:24 p.m. UTC | #2
On Thu, Jun 22, 2017 at 03:25:30PM +0800, AceLan Kao wrote:
> From: "Shih-Yuan Lee (FourDollars)" <sylee@canonical.com>
> 
> T:  Bus=01 Lev=01 Prnt=01 Port=06 Cnt=03 Dev#=  3 Spd=12  MxCh= 0
> D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
> P:  Vendor=0489 ProdID=e0a2 Rev=00.01
> 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: Shih-Yuan Lee (FourDollars) <sylee@canonical.com>
> Suggested-by: Owen Lin <olin@rivetnetworks.com>
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> (cherry picked from commit 06e41d8a36689f465006f017bbcd8a73edb98109)
> Signed-off-by: AceLan Kao <acelan.kao@canonical.com>

Note that you need to include the buglink in the patch (as smb pointed
out), and if a commit doesn't come from Linus' tree you need to note
where it did come from. In this case:

(cherry picked from commit 06e41d8a36689f465006f017bbcd8a73edb98109 linux-next)

Applied to artful/master-next and unstable/master with these changes.

Patch
diff mbox

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 52db1e4..63a1865 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -256,6 +256,7 @@  static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },
+	{ USB_DEVICE(0x0489, 0xe0a2), .driver_info = BTUSB_QCA_ROME },
 	{ USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME },
 
 	/* Broadcom BCM2035 */