2011-11-16 03:21:23

by Keng-Yü Lin

Subject: [PATCH] Bluetooth: Add AR30XX device ID on Asus laptops

The ID is found on Asus K54HR and K53U.
Blacklist the AR3011-based device ID [0489:e03d]
and add to ath3k.c for firmware loading.

Signed-off-by: Keng-Yu Lin <[email protected]>
---
drivers/bluetooth/ath3k.c | 1 +
drivers/bluetooth/btusb.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 106beb1..db811d2 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -64,6 +64,7 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x0CF3, 0x3002) },
{ USB_DEVICE(0x13d3, 0x3304) },
{ USB_DEVICE(0x0930, 0x0215) },
+ { USB_DEVICE(0x0489, 0xE03D) },

/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03F0, 0x311D) },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f9b7260..bf1eb35 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -116,6 +116,7 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+ { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },

/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
--
1.7.5.4

2011-11-30 10:32:37

by Keng-Yü Lin

Subject: [PATCH v2] Bluetooth: Add AR30XX device ID on Asus laptops

The ID is found on Asus K54HR and K53U.
Blacklist the AR3011-based device ID [0489:e03d]
and add to ath3k.c for firmware loading.

Below is the output of usb-devices script:

Before the fiwmware loading:

T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 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=e03d 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

After the fiwmware loading:

T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 5 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0cf3 ProdID=3005 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: Keng-Yu Lin <[email protected]>
---
drivers/bluetooth/ath3k.c | 1 +
drivers/bluetooth/btusb.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 106beb1..db811d2 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -64,6 +64,7 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x0CF3, 0x3002) },
{ USB_DEVICE(0x13d3, 0x3304) },
{ USB_DEVICE(0x0930, 0x0215) },
+ { USB_DEVICE(0x0489, 0xE03D) },

/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03F0, 0x311D) },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index fe4ebc3..d5b9aa4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -119,6 +119,7 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
+ { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },

/* Atheros AR9285 Malbec with sflash firmware */
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
--
1.7.5.4

2011-11-16 05:46:46

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Add AR30XX device ID on Asus laptops

Hi Keng-Yu,

> The ID is found on Asus K54HR and K53U.
> Blacklist the AR3011-based device ID [0489:e03d]
> and add to ath3k.c for firmware loading.

please include the output of /proc/bus/usb/devices or usb-devices script
for this hardware before and after firmware loading. I want this as part
of the commit message so we have it for future reference.

Regards

Marcel

2012-01-12 09:23:38

by Keng-Yü Lin

Subject: Re: [PATCH v2] Bluetooth: Add AR30XX device ID on Asus laptops

Heya,
No intent to push in rush, but the patch is not applied in the tree
after a while. just want to make sure it looks ok and is ready to be
applied in the next round.

Thanks,
-kengyu

On Wed, Nov 30, 2011 at 11:32 AM, Keng-Yu Lin <[email protected]> wrote:
> The ID is found on Asus K54HR and K53U.
> Blacklist the AR3011-based device ID [0489:e03d]
> and add to ath3k.c for firmware loading.
>
> Below is the output of usb-devices script:
>
> Before the fiwmware loading:
>
> T: =C2=A0Bus=3D01 Lev=3D02 Prnt=3D02 Port=3D00 Cnt=3D01 Dev#=3D =C2=A03 S=
pd=3D12 =C2=A0MxCh=3D 0
> D: =C2=A0Ver=3D 1.10 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 MxPS=3D64 #Cfgs=
=3D =C2=A01
> P: =C2=A0Vendor=3D0489 ProdID=3De03d Rev=3D00.01
> C: =C2=A0#Ifs=3D 2 Cfg#=3D 1 Atr=3De0 MxPwr=3D100mA
> I: =C2=A0If#=3D 0 Alt=3D 0 #EPs=3D 3 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 D=
river=3Dbtusb
> I: =C2=A0If#=3D 1 Alt=3D 0 #EPs=3D 2 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 D=
river=3Dbtusb
>
> After the fiwmware loading:
>
> T: =C2=A0Bus=3D01 Lev=3D02 Prnt=3D02 Port=3D00 Cnt=3D01 Dev#=3D =C2=A05 S=
pd=3D12 =C2=A0MxCh=3D 0
> D: =C2=A0Ver=3D 1.10 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 MxPS=3D64 #Cfgs=
=3D =C2=A01
> P: =C2=A0Vendor=3D0cf3 ProdID=3D3005 Rev=3D00.01
> C: =C2=A0#Ifs=3D 2 Cfg#=3D 1 Atr=3De0 MxPwr=3D100mA
> I: =C2=A0If#=3D 0 Alt=3D 0 #EPs=3D 3 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 D=
river=3Dbtusb
> I: =C2=A0If#=3D 1 Alt=3D 0 #EPs=3D 2 Cls=3De0(wlcon) Sub=3D01 Prot=3D01 D=
river=3Dbtusb
>
> Signed-off-by: Keng-Yu Lin <[email protected]>
> ---
> =C2=A0drivers/bluetooth/ath3k.c | =C2=A0 =C2=A01 +
> =C2=A0drivers/bluetooth/btusb.c | =C2=A0 =C2=A01 +
> =C2=A02 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
> index 106beb1..db811d2 100644
> --- a/drivers/bluetooth/ath3k.c
> +++ b/drivers/bluetooth/ath3k.c
> @@ -64,6 +64,7 @@ static struct usb_device_id ath3k_table[] =3D {
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x0CF3, 0x3002) },
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x13d3, 0x3304) },
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x0930, 0x0215) },
> + =C2=A0 =C2=A0 =C2=A0 { USB_DEVICE(0x0489, 0xE03D) },
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Atheros AR9285 Malbec with sflash firmware =
*/
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x03F0, 0x311D) },
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index fe4ebc3..d5b9aa4 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -119,6 +119,7 @@ static struct usb_device_id blacklist_table[] =3D {
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x0cf3, 0x3002), .driver_info =3D=
BTUSB_IGNORE },
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x13d3, 0x3304), .driver_info =3D=
BTUSB_IGNORE },
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x0930, 0x0215), .driver_info =3D=
BTUSB_IGNORE },
> + =C2=A0 =C2=A0 =C2=A0 { USB_DEVICE(0x0489, 0xe03d), .driver_info =3D BTU=
SB_IGNORE },
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Atheros AR9285 Malbec with sflash firmware =
*/
> =C2=A0 =C2=A0 =C2=A0 =C2=A0{ USB_DEVICE(0x03f0, 0x311d), .driver_info =3D=
BTUSB_IGNORE },
> --
> 1.7.5.4
>

2012-02-21 19:06:54

by Gustavo Padovan

Subject: Re: [PATCH v2] Bluetooth: Add AR30XX device ID on Asus laptops

Hi Keng,

* Keng-Yu Lin <[email protected]> [2011-11-30 18:32:37 +0800]:

> The ID is found on Asus K54HR and K53U.
> Blacklist the AR3011-based device ID [0489:e03d]
> and add to ath3k.c for firmware loading.
>
> Below is the output of usb-devices script:
>
> Before the fiwmware loading:
>
> T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 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=e03d 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
>
> After the fiwmware loading:
>
> T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 5 Spd=12 MxCh= 0
> D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
> P: Vendor=0cf3 ProdID=3005 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: Keng-Yu Lin <[email protected]>
> ---
> drivers/bluetooth/ath3k.c | 1 +
> drivers/bluetooth/btusb.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)

Applied, thanks.

Gustavo