Bluetooth: btqca: Add WCN3988 support

Add support for the Bluetooth chip codenamed APACHE which is part of
WCN3988.

The firmware for this chip has a slightly different naming scheme
compared to most others. For ROM Version 0x0200 we need to use
apbtfw10.tlv + apnv10.bin and for ROM version 0x201 apbtfw11.tlv +
apnv11.bin

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index e7e58a956d1544fb56e890a9df416d0d99b040f2..6f2187fab55f557b07876fb0d2fb98056ffb0bd9 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -594,14 +594,20 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        /* Firmware files to download are based on ROM version.
         * ROM version is derived from last two bytes of soc_ver.
         */
-       rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f);
+       if (soc_type == QCA_WCN3988)
+               rom_ver = ((soc_ver & 0x00000f00) >> 0x05) | (soc_ver & 0x0000000f);
+       else
+               rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f);
 
        if (soc_type == QCA_WCN6750)
                qca_send_patch_config_cmd(hdev);
 
        /* Download rampatch file */
        config.type = TLV_TYPE_PATCH;
-       if (qca_is_wcn399x(soc_type)) {
+       if (soc_type == QCA_WCN3988) {
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/apbtfw%02x.tlv", rom_ver);
+       } else if (qca_is_wcn399x(soc_type)) {
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/crbtfw%02x.tlv", rom_ver);
        } else if (soc_type == QCA_QCA6390) {
@@ -636,6 +642,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        if (firmware_name)
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/%s", firmware_name);
+       else if (soc_type == QCA_WCN3988)
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/apnv%02x.bin", rom_ver);
        else if (qca_is_wcn399x(soc_type)) {
                if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) {
                        snprintf(config.fwname, sizeof(config.fwname),

diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index b884095bcd9d06dcaf370130eb5d64d7656b7402..fc6cf314eb0ef3f92a6be68819e7c717c1bb4f44 100644 (file)
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -142,6 +142,7 @@ enum qca_btsoc_type {
        QCA_INVALID = -1,
        QCA_AR3002,
        QCA_ROME,
+       QCA_WCN3988,
        QCA_WCN3990,
        QCA_WCN3998,
        QCA_WCN3991,
@@ -162,8 +163,15 @@ int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 int qca_send_pre_shutdown_cmd(struct hci_dev *hdev);
 static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)
 {
-       return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3991 ||
-              soc_type == QCA_WCN3998;
+       switch (soc_type) {
+       case QCA_WCN3988:
+       case QCA_WCN3990:
+       case QCA_WCN3991:
+       case QCA_WCN3998:
+               return true;
+       default:
+               return false;
+       }
 }
 static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type)
 {

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 9b785c947d96aaaf156c0cd2a9a0dbb1eaded865..011822519602162e1ba6edbfe37103d864f37436 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1874,6 +1874,17 @@ static const struct hci_uart_proto qca_proto = {
        .dequeue        = qca_dequeue,
 };
 
+static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = {
+       .soc_type = QCA_WCN3988,
+       .vregs = (struct qca_vreg []) {
+               { "vddio", 15000  },
+               { "vddxo", 80000  },
+               { "vddrf", 300000 },
+               { "vddch0", 450000 },
+       },
+       .num_vregs = 4,
+};
+
 static const struct qca_device_data qca_soc_data_wcn3990 __maybe_unused = {
        .soc_type = QCA_WCN3990,
        .vregs = (struct qca_vreg []) {
@@ -2398,6 +2409,7 @@ 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,qca9377-bt" },
+       { .compatible = "qcom,wcn3988-bt", .data = &qca_soc_data_wcn3988},
        { .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},