Bluetooth: qca: Support downloading board id specific NVM for WCN7850

[linux-2.6-block.git] / drivers / bluetooth / btqca.c

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 638074992c829b71b5f6682a39b850c77757757a..470f7129fa1890e3068fc7517d38f4e4e4e71eb6 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -737,6 +737,19 @@ static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
                snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
 }
 
+static inline void qca_get_nvm_name_generic(struct qca_fw_config *cfg,
+                                           const char *stem, u8 rom_ver, u16 bid)
+{
+       if (bid == 0x0)
+               snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/%snv%02x.bin", stem, rom_ver);
+       else if (bid & 0xff00)
+               snprintf(cfg->fwname, sizeof(cfg->fwname),
+                        "qca/%snv%02x.b%x", stem, rom_ver, bid);
+       else
+               snprintf(cfg->fwname, sizeof(cfg->fwname),
+                        "qca/%snv%02x.b%02x", stem, rom_ver, bid);
+}
+
 int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                   enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
                   const char *firmware_name)
@@ -817,7 +830,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        /* Give the controller some time to get ready to receive the NVM */
        msleep(10);
 
-       if (soc_type == QCA_QCA2066)
+       if (soc_type == QCA_QCA2066 || soc_type == QCA_WCN7850)
                qca_read_fw_board_id(hdev, &boardid);
 
        /* Download NVM configuration */
@@ -859,8 +872,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                                 "qca/hpnv%02x.bin", rom_ver);
                        break;
                case QCA_WCN7850:
-                       snprintf(config.fwname, sizeof(config.fwname),
-                                "qca/hmtnv%02x.bin", rom_ver);
+                       qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid);
                        break;
 
                default: