summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm
diff options
context:
space:
mode:
authorMoshe Harel <moshe.harel@intel.com>2015-09-06 16:50:33 +0300
committerLuca Coelho <luciano.coelho@intel.com>2015-10-05 12:28:44 +0300
commitbb35dc14182c16e9646f6323cce25f3cfe3ba593 (patch)
tree910a6e7df7d3095bdc0600c494ec4da389f73902 /drivers/net/wireless/iwlwifi/mvm
parent09eef3307e6d55afbdc4cebc8aeacbbb0a7337f6 (diff)
downloadop-kernel-dev-bb35dc14182c16e9646f6323cce25f3cfe3ba593.zip
op-kernel-dev-bb35dc14182c16e9646f6323cce25f3cfe3ba593.tar.gz
iwlwifi: nvm: force 1x1 antenna in Series 8000
This is a workaround to an OTP bug. In Series 8000 1x1, the OTP 0xA052 defines 2x2 antenna configuration. This workaround overrides the decision based on HW id and MIMO disabled bit which is correct in the OTP and set to disabled. Signed-off-by: Moshe Harel <moshe.harel@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/nvm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/iwlwifi/mvm/nvm.c
index 328187d..0b3ffd5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/iwlwifi/mvm/nvm.c
@@ -316,7 +316,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
return iwl_parse_nvm_data(mvm->trans->dev, mvm->cfg, hw, sw, calib,
regulatory, mac_override, phy_sku,
mvm->fw->valid_tx_ant, mvm->fw->valid_rx_ant,
- lar_enabled, mac_addr0, mac_addr1);
+ lar_enabled, mac_addr0, mac_addr1,
+ mvm->trans->hw_id);
}
#define MAX_NVM_FILE_LEN 16384
OpenPOWER on IntegriCloud