| Message ID | 1349120336-15093-1-git-send-email-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 10/01/2012 12:38 PM, Tim Gardner wrote: > From: Yevgeniy Melnichuk <yevgeniy.melnichuk@googlemail.com> > > BugLink: http://bugs.launchpad.net/bugs/1054307 > > Add Sony Vaio T-Series Bluetooth Module( 0x489:0xE036) to > the blacklist of btusb module and add it to the ath3k module. > > output of cat /sys/kernel/debug/usb/devices > > T: Bus=01 Lev=02 Prnt=02 Port=01 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=0489 ProdID=e036 Rev= 0.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 > E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms > E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms > E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms > I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms > I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms > I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms > I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms > I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms > I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms > E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms > > Signed-off-by: Yevgeniy Melnichuk <yevgeniy.melnichuk@googlemail.com> > Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> > Acked-by: Marcel Holtmann <marcel@holtmann.org> > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > (cherry picked from commit bc21fde2d549d1cb1ebef04016eb7affa43bb5c1) > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Clean cherry-pick and low risk of regression. Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > 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 f1bd44f..b033949 100644 > --- a/drivers/bluetooth/ath3k.c > +++ b/drivers/bluetooth/ath3k.c > @@ -82,6 +82,7 @@ static struct usb_device_id ath3k_table[] = { > > /* Atheros AR5BBU22 with sflash firmware */ > { USB_DEVICE(0x0489, 0xE03C) }, > + { USB_DEVICE(0x0489, 0xE036) }, > > { } /* Terminating entry */ > }; > @@ -103,6 +104,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { > > /* Atheros AR5BBU22 with sflash firmware */ > { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, > + { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 }, > > { } /* Terminating entry */ > }; > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index fc40dbd..a300a8f 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -147,6 +147,7 @@ static struct usb_device_id blacklist_table[] = { > > /* Atheros AR5BBU12 with sflash firmware */ > { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, > + { USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 }, > > /* Broadcom BCM2035 */ > { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index f1bd44f..b033949 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -82,6 +82,7 @@ static struct usb_device_id ath3k_table[] = { /* Atheros AR5BBU22 with sflash firmware */ { USB_DEVICE(0x0489, 0xE03C) }, + { USB_DEVICE(0x0489, 0xE036) }, { } /* Terminating entry */ }; @@ -103,6 +104,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { /* Atheros AR5BBU22 with sflash firmware */ { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xE036), .driver_info = BTUSB_ATH3012 }, { } /* Terminating entry */ }; diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index fc40dbd..a300a8f 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -147,6 +147,7 @@ static struct usb_device_id blacklist_table[] = { /* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 }, /* Broadcom BCM2035 */ { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },