Bluetooth: hci_h5: btrtl: Add support for RTL8822C

Add new compatible and FW loading support for RTL8822C.

Signed-off-by: Max Chou <max.chou@realtek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index ca0356dbbb0857940997b3a695fae824cee2784a..4e73a531b37720e58b3d2e10fa92f60b8951f2d3 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -211,7 +211,7 @@ config BT_HCIUART_RTL
        depends on BT_HCIUART
        depends on BT_HCIUART_SERDEV
        depends on GPIOLIB
-       depends on ACPI
+       depends on (ACPI || SERIAL_DEV_CTRL_TTYPORT)
        select BT_HCIUART_3WIRE
        select BT_RTL
        help

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 577cfa3329dbc6f07a9d9e01be06665cea7284a5..67f4bc21e7c599daf4e51050fce8cfd61a4afe61 100644 (file)
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -136,6 +136,18 @@ static const struct id_table ic_id_table[] = {
          .fw_name  = "rtl_bt/rtl8761a_fw.bin",
          .cfg_name = "rtl_bt/rtl8761a_config" },
 
+       /* 8822C with UART interface */
+       { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV |
+                        IC_MATCH_FL_HCIBUS,
+         .lmp_subver = RTL_ROM_LMP_8822B,
+         .hci_rev = 0x000c,
+         .hci_ver = 0x0a,
+         .hci_bus = HCI_UART,
+         .config_needed = true,
+         .has_rom_version = true,
+         .fw_name  = "rtl_bt/rtl8822cs_fw.bin",
+         .cfg_name = "rtl_bt/rtl8822cs_config" },
+
        /* 8822C with USB interface */
        { IC_INFO(RTL_ROM_LMP_8822B, 0xc),
          .config_needed = false,

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 0b14547482a75669d4f020d6d6270af6c1ac9c98..1d817388685208cdc7e04c11e89b822793add2f8 100644 (file)
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -11,6 +11,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/kernel.h>
 #include <linux/mod_devicetable.h>
+#include <linux/of_device.h>
 #include <linux/serdev.h>
 #include <linux/skbuff.h>
 
@@ -810,8 +811,17 @@ static int h5_serdev_probe(struct serdev_device *serdev)
                if (h5->vnd->acpi_gpio_map)
                        devm_acpi_dev_add_driver_gpios(dev,
                                                       h5->vnd->acpi_gpio_map);
+       } else {
+               const void *data;
+
+               data = of_device_get_match_data(dev);
+               if (!data)
+                       return -ENODEV;
+
+               h5->vnd = (const struct h5_vnd *)data;
        }
 
+
        h5->enable_gpio = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
        if (IS_ERR(h5->enable_gpio))
                return PTR_ERR(h5->enable_gpio);
@@ -1003,6 +1013,15 @@ static const struct dev_pm_ops h5_serdev_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(h5_serdev_suspend, h5_serdev_resume)
 };
 
+static const struct of_device_id rtl_bluetooth_of_match[] = {
+#ifdef CONFIG_BT_HCIUART_RTL
+       { .compatible = "realtek,rtl8822cs-bt",
+         .data = (const void *)&rtl_vnd },
+#endif
+       { },
+};
+MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
+
 static struct serdev_device_driver h5_serdev_driver = {
        .probe = h5_serdev_probe,
        .remove = h5_serdev_remove,
@@ -1010,6 +1029,7 @@ static struct serdev_device_driver h5_serdev_driver = {
                .name = "hci_uart_h5",
                .acpi_match_table = ACPI_PTR(h5_acpi_match),
                .pm = &h5_serdev_pm_ops,
+               .of_match_table = rtl_bluetooth_of_match,
        },
 };