diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-06 07:29:58 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-06 07:46:56 -0400 |
commit | 40df783d1ef1989ac454e3dfcda017270b8950e6 (patch) | |
tree | e667691bc66af5518be560d57dc32ba28efd33e3 /drivers/bluetooth | |
parent | 09ae260ba452c2ed36ec295941a58cb75db213ed (diff) |
Bluetooth: Add support for Intel bootloader devices
Intel Bluetooth devices that boot up in bootloader mode can not
be used as generic HCI devices, but their HCI transport is still
valuable and so bring that up as raw-only devices.
T: Bus=02 Lev=02 Prnt=03 Port=00 Cnt=01 Dev#= 14 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=ff(vend.) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=8087 ProdID=0a5a Rev= 0.00
S: Manufacturer=Intel(R) Corporation
S: Product=Intel(R) Wilkins Peak 2x2
S: SerialNumber=001122334455 WP_A0
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms
E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms
I: If#= 1 Alt= 1 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms
I: If#= 1 Alt= 2 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms
I: If#= 1 Alt= 3 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms
I: If#= 1 Alt= 4 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms
I: If#= 1 Alt= 5 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/btusb.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 61d8385666e9..21f10cac4fac 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -49,7 +49,8 @@ static struct usb_driver btusb_driver; | |||
49 | #define BTUSB_WRONG_SCO_MTU 0x40 | 49 | #define BTUSB_WRONG_SCO_MTU 0x40 |
50 | #define BTUSB_ATH3012 0x80 | 50 | #define BTUSB_ATH3012 0x80 |
51 | #define BTUSB_INTEL 0x100 | 51 | #define BTUSB_INTEL 0x100 |
52 | #define BTUSB_BCM_PATCHRAM 0x200 | 52 | #define BTUSB_INTEL_BOOT 0x200 |
53 | #define BTUSB_BCM_PATCHRAM 0x400 | ||
53 | 54 | ||
54 | static const struct usb_device_id btusb_table[] = { | 55 | static const struct usb_device_id btusb_table[] = { |
55 | /* Generic Bluetooth USB device */ | 56 | /* Generic Bluetooth USB device */ |
@@ -121,6 +122,9 @@ static const struct usb_device_id btusb_table[] = { | |||
121 | /* IMC Networks - Broadcom based */ | 122 | /* IMC Networks - Broadcom based */ |
122 | { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, | 123 | { USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, |
123 | 124 | ||
125 | /* Intel Bluetooth USB Bootloader (RAM module) */ | ||
126 | { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT }, | ||
127 | |||
124 | { } /* Terminating entry */ | 128 | { } /* Terminating entry */ |
125 | }; | 129 | }; |
126 | 130 | ||
@@ -1770,6 +1774,9 @@ static int btusb_probe(struct usb_interface *intf, | |||
1770 | hdev->set_bdaddr = btusb_set_bdaddr_intel; | 1774 | hdev->set_bdaddr = btusb_set_bdaddr_intel; |
1771 | } | 1775 | } |
1772 | 1776 | ||
1777 | if (id->driver_info & BTUSB_INTEL_BOOT) | ||
1778 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); | ||
1779 | |||
1773 | /* Interface numbers are hardcoded in the specification */ | 1780 | /* Interface numbers are hardcoded in the specification */ |
1774 | data->isoc = usb_ifnum_to_if(data->udev, 1); | 1781 | data->isoc = usb_ifnum_to_if(data->udev, 1); |
1775 | 1782 | ||