summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-09 03:11:35 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-09 03:11:35 -0800
commit521046c118e7bffe7f93a2f8f42d754d2693a9a0 (patch)
treebd4e438170eb835750ce1961759a04ee222fa5dc /drivers/net/wireless
parent33112fe182ee96103547e7aeaf8f15ae76904dd0 (diff)
parent0e9ed4cf132685f28cb23c0bace4cef69a3185d7 (diff)
Merge "ath10k: Skip reading of firmware-5.bin file"
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath10k/core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 871329c79a46..4d01846e6115 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1298,6 +1298,14 @@ err:
static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
{
int ret;
+ struct ath10k_fw_file *fw_file;
+
+ if (!ar->is_bmi && QCA_REV_WCN3990(ar)) {
+ fw_file = &ar->normal_mode_fw.fw_file;
+ fw_file->wmi_op_version = ATH10K_FW_WMI_OP_VERSION_HL_1_0;
+ fw_file->htt_op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
+ return 0;
+ }
if (ar->is_bmi) {
/* calibration file is optional, don't check for any errors */