wil6210: support Talyn specific FW file

FW file name for Talyn device is different from the default name.
This patch searches for Talyn specific FW file name and fallback
to the default FW file in case it is not present.

Signed-off-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index 8b148cb91372f4fac59aa3cac56469f809c1145e..7192d9a912785d10aa6ab012d6e99d43027c271d 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -93,6 +93,10 @@ int wil_set_capabilities(struct wil6210_priv *wil)
                if (wil_r(wil, RGF_USER_OTP_HW_RD_MACHINE_1) &
                    BIT_NO_FLASH_INDICATION)
                        set_bit(hw_capa_no_flash, wil->hw_capa);
+               wil_fw_name = ftm_mode ? WIL_FW_NAME_FTM_TALYN :
+                             WIL_FW_NAME_TALYN;
+               if (wil_fw_verify_file_exists(wil, wil_fw_name))
+                       wil->wil_fw_name = wil_fw_name;
                break;
        case JTAG_DEV_ID_TALYN_MB:
                wil->hw_name = "Talyn-MB";
@@ -104,6 +108,10 @@ int wil_set_capabilities(struct wil6210_priv *wil)
                set_bit(hw_capa_no_flash, wil->hw_capa);
                wil->use_enhanced_dma_hw = true;
                wil->use_rx_hw_reordering = true;
+               wil_fw_name = ftm_mode ? WIL_FW_NAME_FTM_TALYN :
+                             WIL_FW_NAME_TALYN;
+               if (wil_fw_verify_file_exists(wil, wil_fw_name))
+                       wil->wil_fw_name = wil_fw_name;
                break;
        default:
                wil_err(wil, "Unknown board hardware, chip_id 0x%08x, chip_revision 0x%08x\n",

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index b06cba528a1b0aa37e4937207b092d6202f9a007..00719a018a4a27d597ae7f10639780f5f0cc7c7d 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -50,6 +50,9 @@ union wil_tx_desc;
 #define WIL_FW_NAME_SPARROW_PLUS "wil6210_sparrow_plus.fw"
 #define WIL_FW_NAME_FTM_SPARROW_PLUS "wil6210_sparrow_plus_ftm.fw"
 
+#define WIL_FW_NAME_TALYN "wil6436.fw"
+#define WIL_FW_NAME_FTM_TALYN "wil6436_ftm.fw"
+
 #define WIL_BOARD_FILE_NAME "wil6210.brd" /* board & radio parameters */
 
 #define WIL_DEFAULT_BUS_REQUEST_KBPS 128000 /* ~1Gbps */