Commit 848fc616 authored by Max Chou's avatar Max Chou Committed by Marcel Holtmann
Browse files

Bluetooth: hci_h5: btrtl: Add support for RTL8822C 



Add new compatible and FW loading support for RTL8822C.

Signed-off-by: default avatarMax Chou <max.chou@realtek.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e22998f5

drivers/bluetooth/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/bluetooth/btrtl.c

+12 −0
Original line number Diff line number Diff line
@@ -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,

drivers/bluetooth/hci_h5.c

+20 −0
Original line number Diff line number Diff line
@@ -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,

	},

};