Return-Path: From: Martin Blumenstingl To: robh+dt@kernel.org, devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-serial@vger.kernel.org Cc: mark.rutland@arm.com, marcel@holtmann.org, gustavo@padovan.org, johan.hedberg@gmail.com, gregkh@linuxfoundation.org, jslaby@suse.com, johan@kernel.org, linux-amlogic@lists.infradead.org, Larry.Finger@lwfinger.net, carlo@endlessm.com, drake@endlessm.com, Martin Blumenstingl Subject: [RFC v2 6/9] Bluetooth: btrtl: add support for the RTL8723BS and RTL8723DS chips Date: Mon, 1 Jan 2018 21:42:14 +0100 Message-Id: <20180101204217.26165-7-martin.blumenstingl@googlemail.com> In-Reply-To: <20180101204217.26165-1-martin.blumenstingl@googlemail.com> References: <20180101204217.26165-1-martin.blumenstingl@googlemail.com> List-ID: The Realtek RTL8723BS and RTL8723DS chipsets are SDIO wifi chips. They also contain a Bluetooth module which is connected via UART to the host. Realtek's userspace initialization tool (rtk_hciattach) differentiates these two via the HCI version and revision returned by the HCI_OP_READ_LOCAL_VERSION command. Additionally we apply these checks only the for UART devices. Everything else is assumed to be a "RTL8723B" which was originally supported by the driver (communicating via USB). Signed-off-by: Martin Blumenstingl --- drivers/bluetooth/btrtl.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index b6e8da4b73f8..25e9743643f5 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -418,9 +418,33 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev) has_rom_version = false; break; case RTL_ROM_LMP_8723B: - fw_name = "rtl_bt/rtl8723b_fw.bin"; - cfg_name = "rtl_bt/rtl8723b_config.bin"; + /* all variants support reading the ROM version */ has_rom_version = true; + + /* + * RTL8723 devices exist in different variants: + * - RTL8723BS (SDIO chip with UART Bluetooth) + * - RTL8723DS (SDIO chip with UART Bluetooth) + * - for backwards-compatibility everything else is assumed to + * be an RTL8723B communicating over USB + * + * Only UART devices really need the config because that + * contains the UART speed / flow control settings. + */ + if (hdev->bus == HCI_UART && resp->hci_ver == 6 && + le16_to_cpu(resp->hci_rev) == 0xb) { + fw_name = "rtl_bt/rtl8723bs_fw.bin"; + cfg_name = "rtl_bt/rtl8723bs_config.bin"; + cfg_needed = true; + } else if (hdev->bus == HCI_UART && resp->hci_ver == 8 && + le16_to_cpu(resp->hci_rev) == 0xd) { + fw_name = "rtl_bt/rtl8723ds_fw.bin"; + cfg_name = "rtl_bt/rtl872ds_config.bin"; + cfg_needed = true; + } else { + fw_name = "rtl_bt/rtl8723b_fw.bin"; + cfg_name = "rtl_bt/rtl8723b_config.bin"; + } break; case RTL_ROM_LMP_8821A: fw_name = "rtl_bt/rtl8821a_fw.bin"; @@ -637,6 +661,10 @@ MODULE_LICENSE("GPL"); MODULE_FIRMWARE("rtl_bt/rtl8723a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723b_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8723b_config.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8723bs_fw.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8723bs_config.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8723ds_fw.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin"); -- 2.15.1