diff options
| author | Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org> | 2020-11-19 18:24:09 +0530 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2020-12-07 16:59:55 +0200 |
| commit | 059924fdf6c1c31a7c1aa1915884e23f4313dde2 (patch) | |
| tree | 07d191cb4f8c7f969376bf2614f82679db6555d1 /drivers/bluetooth/hci_qca.c | |
| parent | 353021588cb57db15d52f9b157ad6f2251250b50 (diff) | |
| download | linux-059924fdf6c1c31a7c1aa1915884e23f4313dde2.tar.gz linux-059924fdf6c1c31a7c1aa1915884e23f4313dde2.tar.bz2 linux-059924fdf6c1c31a7c1aa1915884e23f4313dde2.zip | |
Bluetooth: btqca: Use NVM files based on SoC ID for WCN3991
This change will allow to use different NVM file based
on WCN3991 BT SoC ID.Need to use different NVM file based on
fab location for WCN3991 BT SoC.
Signed-off-by: Venkata Lakshmi Narayana Gubba <gubbaven@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/hci_qca.c')
| -rw-r--r-- | drivers/bluetooth/hci_qca.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 5cc7b163020c..4a963682c702 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1655,7 +1655,7 @@ static int qca_setup(struct hci_uart *hu) enum qca_btsoc_type soc_type = qca_soc_type(hu); const char *firmware_name = qca_get_firmware_name(hu); int ret; - int soc_ver = 0; + struct qca_btsoc_version ver; ret = qca_check_speeds(hu); if (ret) @@ -1684,7 +1684,7 @@ retry: if (qca_is_wcn399x(soc_type)) { set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); - ret = qca_read_soc_version(hdev, &soc_ver, soc_type); + ret = qca_read_soc_version(hdev, &ver, soc_type); if (ret) goto out; } else { @@ -1703,14 +1703,13 @@ retry: if (!qca_is_wcn399x(soc_type)) { /* Get QCA version information */ - ret = qca_read_soc_version(hdev, &soc_ver, soc_type); + ret = qca_read_soc_version(hdev, &ver, soc_type); if (ret) goto out; } - bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver); /* Setup patch / NVM configurations */ - ret = qca_uart_setup(hdev, qca_baudrate, soc_type, soc_ver, + ret = qca_uart_setup(hdev, qca_baudrate, soc_type, ver, firmware_name); if (!ret) { clear_bit(QCA_IBS_DISABLED, &qca->flags); |