Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Bluetooth: btusb: Add flag to define wideband speech capability

This change adds a new flag to define a controller's wideband speech
capability. This is required since no reliable over HCI mechanism
exists to query the controller and driver's compatibility with
wideband speech.

Signed-off-by: Alain Michaud <alainm@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

authored by

Alain Michaud and committed by
Marcel Holtmann
3e4e3f73 e37c57a8

+13 -6
+13 -6
drivers/bluetooth/btusb.c
··· 57 57 #define BTUSB_IFNUM_2 0x80000 58 58 #define BTUSB_CW6622 0x100000 59 59 #define BTUSB_MEDIATEK 0x200000 60 + #define BTUSB_WIDEBAND_SPEECH 0x400000 60 61 61 62 static const struct usb_device_id btusb_table[] = { 62 63 /* Generic Bluetooth USB device */ ··· 334 333 { USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL }, 335 334 336 335 /* Intel Bluetooth devices */ 337 - { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW }, 338 - { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW }, 339 - { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW }, 336 + { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW | 337 + BTUSB_WIDEBAND_SPEECH }, 338 + { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW | 339 + BTUSB_WIDEBAND_SPEECH }, 340 + { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW | 341 + BTUSB_WIDEBAND_SPEECH }, 340 342 { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR }, 341 343 { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, 342 344 { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL }, 343 - { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW }, 344 - { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL }, 345 - { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW }, 345 + { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW | 346 + BTUSB_WIDEBAND_SPEECH }, 347 + { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL | 348 + BTUSB_WIDEBAND_SPEECH }, 349 + { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW | 350 + BTUSB_WIDEBAND_SPEECH }, 346 351 347 352 /* Other Intel Bluetooth devices */ 348 353 { USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),