| From 445746b3faf61adde0bd11e489725bf9a2d81bfc Mon Sep 17 00:00:00 2001 |
| From: "Edgar (gimli) Hucek" <gimli@dark-green.com> |
| Date: Thu, 4 Nov 2010 08:04:33 +0100 |
| Subject: [PATCH] Bluetooth: Add MacBookAir3,1(2) support |
| |
| commit 3e3ede7dda2d77d2cbec608e663b6a6ace501bfc upstream. |
| |
| Adding the new MacBookAir3,1(2) to btusb. |
| |
| Output without the patch and btusb loaded : |
| |
| T: Bus=03 Lev=02 Prnt=03 Port=02 Cnt=01 Dev#= 6 Spd=12 MxCh= 0 |
| D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 |
| P: Vendor=05ac ProdID=821b Rev= 0.34 |
| S: Manufacturer=Apple Inc. |
| S: Product=Bluetooth USB Host Controller |
| C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA |
| I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=01 Prot=01 Driver=(none) |
| 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=(none) |
| 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=(none) |
| 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=(none) |
| 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=(none) |
| E: Ad=83(I) Atr=01(Isoc) MxPS= 32 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 32 Ivl=1ms |
| I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) |
| E: Ad=83(I) Atr=01(Isoc) MxPS= 64 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 64 Ivl=1ms |
| I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) |
| E: Ad=83(I) Atr=01(Isoc) MxPS= 64 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 64 Ivl=1ms |
| I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) |
| E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms |
| E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms |
| I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) |
| |
| Output with the patch and btusb loaded : |
| |
| T: Bus=03 Lev=02 Prnt=03 Port=02 Cnt=01 Dev#= 6 Spd=12 MxCh= 0 |
| D: Ver= 2.00 Cls=ff(vend.) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 |
| P: Vendor=05ac ProdID=821b Rev= 0.34 |
| S: Manufacturer=Apple Inc. |
| S: Product=Bluetooth USB Host Controller |
| C:* #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr= 0mA |
| I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) 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= 32 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 32 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= 64 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 64 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= 64 Ivl=1ms |
| E: Ad=03(O) Atr=01(Isoc) MxPS= 64 Ivl=1ms |
| I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) |
| E: Ad=84(I) Atr=02(Bulk) MxPS= 32 Ivl=0ms |
| E: Ad=04(O) Atr=02(Bulk) MxPS= 32 Ivl=0ms |
| I:* If#= 3 Alt= 0 #EPs= 0 Cls=fe(app. ) Sub=01 Prot=01 Driver=(none) |
| |
| Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com> |
| Acked-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c |
| index 7225e11..0eb6d1b 100644 |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -71,6 +71,9 @@ static struct usb_device_id btusb_table[] = { |
| /* Apple MacBookPro6,2 */ |
| { USB_DEVICE(0x05ac, 0x8218) }, |
| |
| + /* Apple MacBookAir3,1, MacBookAir3,2 */ |
| + { USB_DEVICE(0x05ac, 0x821b) }, |
| + |
| /* AVM BlueFRITZ! USB v2.0 */ |
| { USB_DEVICE(0x057c, 0x3800) }, |
| |
| -- |
| 1.7.7 |
| |