summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qti.qualcomm.com>2016-04-07 06:37:29 (GMT)
committerKalle Valo <kvalo@qca.qualcomm.com>2016-04-07 15:49:35 (GMT)
commitb131129d96575479e2447d134cb1797cf430b3a4 (patch)
tree015d6eadbb19e36a1efdca519a6b5949739b4017 /drivers/net/wireless
parenta2cb3d5f043e4cc646c396a3e188a171b38c15a0 (diff)
downloadlinux-b131129d96575479e2447d134cb1797cf430b3a4.tar.xz
ath10k: fix calibration init sequence of qca99x0
pre-calibration is meant for qca4019 which contains only caldata whereas calibration file is used by ar9888 and qca99x0 that contains both board data and caldata. So by definition both pre-cal-file and cal-file can not coexist. Keeping them in shared memory (union), is breaking boot sequence of qca99x0. Fix it by storing both binaries in separate memories. This issue is reported in ipq8064 platform which includes caldata in flash memory. Fixes: 3d9195ea19e4 ("ath10k: incorporate qca4019 cal data download sequence") Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath10k/core.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index c23c373..d85b991 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -728,10 +728,8 @@ struct ath10k {
const void *firmware_data;
size_t firmware_len;
- union {
- const struct firmware *pre_cal_file;
- const struct firmware *cal_file;
- };
+ const struct firmware *pre_cal_file;
+ const struct firmware *cal_file;
struct {
const void *firmware_codeswap_data;