[PATCH v8 6/7] Bluetooth: btqca: Add wcn3990 firmware download support.

[Balakrishna Godavarthi]

This patch enables the RAM and NV patch download for wcn3990.

Signed-off-by: Balakrishna Godavarthi <bgoda...@codeaurora.org>
Reviewed-by: Matthias Kaehlcke <m...@chromium.org>
---
 drivers/bluetooth/btqca.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 3b25be1be19c..25ef67739de0 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -332,6 +332,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 {
        struct rome_config config;
        int err;
+       u8 rom_ver;
 
        bt_dev_dbg(hdev, "QCA setup on UART");
 
@@ -346,11 +347,21 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                }
                bt_dev_info(hdev, "QCA controller version 0x%08x", soc_ver);
        }
-
        /* Download rampatch file */
        config.type = TLV_TYPE_PATCH;
-       snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin",
-                soc_ver);
+       if (soc_type == QCA_WCN3990) {
+               /* 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);
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/crbtfw%02x.tlv", rom_ver);
+       } else {
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/rampatch_%08x.bin", soc_ver);
+       }
+
        err = qca_download_firmware(hdev, &config);
        if (err < 0) {
                bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
@@ -359,8 +370,13 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 
        /* Download NVM configuration */
        config.type = TLV_TYPE_NVM;
-       snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",
-                soc_ver);
+       if (soc_type == QCA_WCN3990)
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/crnv%02x.bin", rom_ver);
+       else
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/nvm_%08x.bin", soc_ver);
+
        err = qca_download_firmware(hdev, &config);
        if (err < 0) {
                bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project