Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 981ee23b authored by Alain Michaud's avatar Alain Michaud Committed by Greg Kroah-Hartman
Browse files

Bluetooth: btusb: Add flag to define wideband speech capability 



[ Upstream commit 3e4e3f73b9f4944ebd8100dbe107f2325aa79c6d ]

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: default avatarAlain Michaud <alainm@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Stable-dep-of: da06ff1f585e ("Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0fe69c99

drivers/bluetooth/btusb.c

+13 −6
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static struct usb_driver btusb_driver; 
#define BTUSB_IFNUM_2		0x80000

#define BTUSB_CW6622		0x100000

#define BTUSB_MEDIATEK		0x200000

#define BTUSB_WIDEBAND_SPEECH	0x400000



static const struct usb_device_id btusb_table[] = {

	/* Generic Bluetooth USB device */
@@ -332,15 +333,21 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },



	/* Intel Bluetooth devices */

	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_NEW |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },

	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW },

	{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL |

						     BTUSB_WIDEBAND_SPEECH },

	{ USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW |

						     BTUSB_WIDEBAND_SPEECH },



	/* Other Intel Bluetooth devices */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x8087, 0xe0, 0x01, 0x01),