| From 603bc5a3cd111af34a7f0d97abd33d6a913b67da Mon Sep 17 00:00:00 2001 |
| From: Alain Michaud <alainm@chromium.org> |
| Date: Mon, 6 Jul 2020 21:26:56 +0000 |
| Subject: [PATCH] BACKPORT: FROMLIST: Bluetooth: adding BTUSB_VALID_LE_STATES |
| to Intel Controllers |
| |
| This patch adds the BTUSB_VALID_LE_STATES to the appropriate Intel |
| controllers. |
| |
| Signed-off-by: Alain Michaud <alainm@chromium.org> |
| Reviewed-by: Chethan Tumkur Narayan <chethan.tumkur.narayan@intel.corp-partner.google.com> |
| |
| (am from https://patchwork.kernel.org/patch/11649433/) |
| |
| BUG=b:153069444 |
| TEST=bluetoothctl -> show and validate the roles are appropriately |
| shown. |
| |
| Signed-off-by: Alain Michaud <alainm@chromium.org> |
| Change-Id: Id42f6bb7bdec3df48402b8665a6b0eeda3d3f93d |
| Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2285363 |
| Reviewed-by: Manish Mandlik <mmandlik@chromium.org> |
| [rebase510(groeck): Context conflicts] |
| Signed-off-by: Guenter Roeck <groeck@chromium.org> |
| --- |
| drivers/bluetooth/btusb.c | 12 ++++++++---- |
| 1 file changed, 8 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c |
| index 52683fd22e05..f82b2e86f9c5 100644 |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -363,20 +363,24 @@ static const struct usb_device_id blacklist_table[] = { |
| BTUSB_WIDEBAND_SPEECH | |
| BTUSB_VALID_LE_STATES }, |
| { USB_DEVICE(0x8087, 0x0026), .driver_info = BTUSB_INTEL_NEW | |
| - BTUSB_WIDEBAND_SPEECH }, |
| + BTUSB_WIDEBAND_SPEECH | |
| + BTUSB_VALID_LE_STATES }, |
| { USB_DEVICE(0x8087, 0x0029), .driver_info = BTUSB_INTEL_NEW | |
| BTUSB_WIDEBAND_SPEECH }, |
| { USB_DEVICE(0x8087, 0x0032), .driver_info = BTUSB_INTEL_NEWGEN | |
| - BTUSB_WIDEBAND_SPEECH}, |
| + BTUSB_WIDEBAND_SPEECH | |
| + BTUSB_VALID_LE_STATES }, |
| { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_NEWGEN | |
| 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 | |
| - BTUSB_WIDEBAND_SPEECH }, |
| + BTUSB_WIDEBAND_SPEECH | |
| + BTUSB_VALID_LE_STATES }, |
| { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL | |
| - BTUSB_WIDEBAND_SPEECH }, |
| + BTUSB_WIDEBAND_SPEECH | |
| + BTUSB_VALID_LE_STATES }, |
| { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_NEW | |
| BTUSB_WIDEBAND_SPEECH | |
| BTUSB_VALID_LE_STATES }, |
| -- |
| 2.17.1 |
| |
