[linux-oem-4.13][PATCH 1/1] UBUNTU: SAUCE: support realtek bluetooth 0bda:c024

[Wen-chien Jesse Sung]

BugLink: https://launchpad.net/bugs/1771919

Blasklist it in btusb, and add the ID to rtk-btusb.

Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 drivers/bluetooth/btusb.c    | 1 +
 ubuntu/rtl8821ce-bt/rtk_bt.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1dba082b58f9..b49c21eee1a2 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -347,6 +347,7 @@ static const struct usb_device_id blacklist_table[] = {
 
 	/* Realtek devices handled by rtk-btusb */
 	{ USB_DEVICE(0x0bda, 0xb00a), .driver_info = BTUSB_IGNORE },
+	{ USB_DEVICE(0x0bda, 0xc024), .driver_info = BTUSB_IGNORE },
 
 	/* Realtek Bluetooth devices */
 	{ USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01),
diff --git a/ubuntu/rtl8821ce-bt/rtk_bt.c b/ubuntu/rtl8821ce-bt/rtk_bt.c
index db12ab4e9a3f..9244326e30f8 100644
--- a/ubuntu/rtl8821ce-bt/rtk_bt.c
+++ b/ubuntu/rtl8821ce-bt/rtk_bt.c
@@ -52,6 +52,11 @@ static struct usb_device_id btusb_table[] = {
 		.match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT,
 		.idVendor = 0x0bda,
 		.idProduct = 0xb00a,
+	},
+	{
+		.match_flags = USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT,
+		.idVendor = 0x0bda,
+		.idProduct = 0xc024,
 	}, { }
 };
 
@@ -1674,6 +1679,7 @@ static patch_info fw_patch_table[] = {
 	{0xb820, 0x8821, "mp_rtl8821cu_fw", "rtl8821cu_fw", "rtl8821cu_config", NULL, 0 }, /* RTL8821CU */
 	{0xc820, 0x8821, "mp_rtl8821cu_fw", "rtl8821cu_fw", "rtl8821cu_config", NULL, 0 }, /* RTL8821CU */
 	{0xb00a, 0x8821, "mp_rtl8821cu_fw", "rtl8821cu_fw", "rtl8821cu_config_0bda_b00a", NULL, 0 }, /* RTL8821CE */
+	{0xc024, 0x8821, "mp_rtl8821cu_fw", "rtl8821cu_fw", "rtl8821cu_config_0bda_c024", NULL, 0 }, /* RTL8821CE */
 
 /* NOTE: must append patch entries above the null entry */
 	{0, 0, NULL, NULL, NULL, NULL, 0}
-- 
2.17.0