Commit e5d6468f authored by Rocky Liao's avatar Rocky Liao Committed by Marcel Holtmann
Browse files

Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA6390 



This patch adds support for QCA6390, including the devicetree and acpi
compatible hwid matching, and patch/nvm downloading.

Signed-off-by: default avatarRocky Liao <rjliao@codeaurora.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 1a323ea5

drivers/bluetooth/btqca.c

+13 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version, 
	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

	if (soc_type >= QCA_WCN3991) {

		event_type = 0;

		rlen += 1;

		rtype = EDL_PATCH_VER_REQ_CMD;
@@ -69,7 +69,7 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version, 
		goto out;

	}



	if (soc_type == QCA_WCN3991)

	if (soc_type >= QCA_WCN3991)

		memmove(&edl->data, &edl->data[1], sizeof(*ver));



	ver = (struct qca_btsoc_version *)(edl->data);
@@ -217,7 +217,7 @@ static void qca_tlv_check_data(struct qca_fw_config *config, 
				tlv_nvm->data[0] |= 0x80;



				/* UART Baud Rate */

				if (soc_type == QCA_WCN3991)

				if (soc_type >= QCA_WCN3991)

					tlv_nvm->data[1] = nvm_baud_rate;

				else

					tlv_nvm->data[2] = nvm_baud_rate;
@@ -268,7 +268,7 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
	 * VSE event. WCN3991 sends version command response as a payload to

	 * command complete event.

	 */

	if (soc_type == QCA_WCN3991) {

	if (soc_type >= QCA_WCN3991) {

		event_type = 0;

		rlen = sizeof(*edl);

		rtype = EDL_PATCH_TLV_REQ_CMD;
@@ -301,7 +301,7 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size, 
		err = -EIO;

	}



	if (soc_type == QCA_WCN3991)

	if (soc_type >= QCA_WCN3991)

		goto out;



	tlv_resp = (struct tlv_seg_resp *)(edl->data);
@@ -442,6 +442,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
			    (soc_ver & 0x0000000f);

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/crbtfw%02x.tlv", rom_ver);

	} else if (soc_type == QCA_QCA6390) {

		rom_ver = ((soc_ver & 0x00000f00) >> 0x04) |

			    (soc_ver & 0x0000000f);

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/htbtfw%02x.tlv", rom_ver);

	} else {

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/rampatch_%08x.bin", soc_ver);
@@ -464,6 +469,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, 
	else if (qca_is_wcn399x(soc_type))

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/crnv%02x.bin", rom_ver);

	else if (soc_type == QCA_QCA6390)

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/htnv%02x.bin", rom_ver);

	else

		snprintf(config.fwname, sizeof(config.fwname),

			 "qca/nvm_%08x.bin", soc_ver);

drivers/bluetooth/btqca.h

+2 −1
Original line number Diff line number Diff line
@@ -125,8 +125,9 @@ enum qca_btsoc_type { 
	QCA_AR3002,

	QCA_ROME,

	QCA_WCN3990,

	QCA_WCN3991,

	QCA_WCN3998,

	QCA_WCN3991,

	QCA_QCA6390,

};



#if IS_ENABLED(CONFIG_BT_QCA)

drivers/bluetooth/hci_qca.c

+33 −7
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/acpi.h>

#include <linux/platform_device.h>

#include <linux/regulator/consumer.h>

#include <linux/serdev.h>
@@ -1596,7 +1597,7 @@ static int qca_setup(struct hci_uart *hu) 
	set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);



	bt_dev_info(hdev, "setting up %s",

		qca_is_wcn399x(soc_type) ? "wcn399x" : "ROME");

		qca_is_wcn399x(soc_type) ? "wcn399x" : "ROME/QCA6390");



retry:

	ret = qca_power_on(hdev);
@@ -1665,10 +1666,10 @@ static int qca_setup(struct hci_uart *hu) 
	}



	/* Setup bdaddr */

	if (qca_is_wcn399x(soc_type))

		hu->hdev->set_bdaddr = qca_set_bdaddr;

	else

	if (soc_type == QCA_ROME)

		hu->hdev->set_bdaddr = qca_set_bdaddr_rome;

	else

		hu->hdev->set_bdaddr = qca_set_bdaddr;



	return ret;

}
@@ -1721,6 +1722,11 @@ static const struct qca_vreg_data qca_soc_data_wcn3998 = { 
	.num_vregs = 4,

};



static const struct qca_vreg_data qca_soc_data_qca6390 = {

	.soc_type = QCA_QCA6390,

	.num_vregs = 0,

};



static void qca_power_shutdown(struct hci_uart *hu)

{

	struct qca_serdev *qcadev;
@@ -1764,7 +1770,7 @@ static int qca_power_off(struct hci_dev *hdev) 
	enum qca_btsoc_type soc_type = qca_soc_type(hu);



	/* Stop sending shutdown command if soc crashes. */

	if (qca_is_wcn399x(soc_type)

	if (soc_type != QCA_ROME

		&& qca->memdump_state == QCA_MEMDUMP_IDLE) {

		qca_send_pre_shutdown_cmd(hdev);

		usleep_range(8000, 10000);
@@ -1900,7 +1906,11 @@ static int qca_serdev_probe(struct serdev_device *serdev) 
			return err;

		}

	} else {

		if (data)

			qcadev->btsoc_type = data->soc_type;

		else

			qcadev->btsoc_type = QCA_ROME;



		qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",

					       GPIOD_OUT_LOW);

		if (!qcadev->bt_en) {
@@ -2044,21 +2054,37 @@ static int __maybe_unused qca_resume(struct device *dev) 


static SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume);



#ifdef CONFIG_OF

static const struct of_device_id qca_bluetooth_of_match[] = {

	{ .compatible = "qcom,qca6174-bt" },

	{ .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390},

	{ .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990},

	{ .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},

	{ .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);

#endif



#ifdef CONFIG_ACPI

static const struct acpi_device_id qca_bluetooth_acpi_match[] = {

	{ "QCOM6390", (kernel_ulong_t)&qca_soc_data_qca6390 },

	{ "DLA16390", (kernel_ulong_t)&qca_soc_data_qca6390 },

	{ "DLB16390", (kernel_ulong_t)&qca_soc_data_qca6390 },

	{ "DLB26390", (kernel_ulong_t)&qca_soc_data_qca6390 },

	{ },

};

MODULE_DEVICE_TABLE(acpi, qca_bluetooth_acpi_match);

#endif





static struct serdev_device_driver qca_serdev_driver = {

	.probe = qca_serdev_probe,

	.remove = qca_serdev_remove,

	.driver = {

		.name = "hci_uart_qca",

		.of_match_table = qca_bluetooth_of_match,

		.of_match_table = of_match_ptr(qca_bluetooth_of_match),

		.acpi_match_table = ACPI_PTR(qca_bluetooth_acpi_match),

		.pm = &qca_pm_ops,

	},

};