commit f4ae2cac6acdaab86acdb10b2f55729bc517d28d
author Abhishek Pandit-Subedi <abhishekpandit@chromium.org> Mon Nov 02 19:21:53 2020
committer Commit Bot <commit-bot@chromium.org> Tue Nov 03 08:39:47 2020
tree b6e18d3e2824b728a56171b4fe2684baab3192dc
parent 2f995c1e6a3317dabbc7796a200853ed26cc9644

CHROMIUM: Bluetooth: Disable wideband speech on 8822CE

Due to co-ex issues, we aren't ready to enable WBS on 8822CE yet. Revert
this change when enabling WBS on Realtek.

BUG=b:171926803, b:172253559
TEST=Made sure Ezkinil isn't broken

Change-Id: Ia99f5c3b29bbefe85c6cdc5eb936eaf7d3b214f0
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2514910
Reviewed-by: Alain Michaud <alainm@chromium.org>
Reviewed-by: Shyh-In Hwang <josephsih@chromium.org>

drivers/bluetooth/btusb.c

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1053ea7..4a17ed9 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -409,22 +409,14 @@
 	{ USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK },
 
 	/* Additional Realtek 8822CE Bluetooth devices */
-	{ USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x04c5, 0x161f), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x0b05, 0x18ef), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x13d3, 0x3548), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x13d3, 0x3549), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x13d3, 0x3553), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x13d3, 0x3555), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
-	{ USB_DEVICE(0x2ff8, 0x3051), .driver_info = BTUSB_REALTEK |
-						     BTUSB_WIDEBAND_SPEECH },
+	{ USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x04c5, 0x161f), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x0b05, 0x18ef), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x13d3, 0x3548), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x13d3, 0x3549), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x13d3, 0x3553), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x13d3, 0x3555), .driver_info = BTUSB_REALTEK },
+	{ USB_DEVICE(0x2ff8, 0x3051), .driver_info = BTUSB_REALTEK },
 
 	/* Silicon Wave based devices */
 	{ USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },