projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3e454b)
iwlwifi: move common 9000 cfg parameters to common macro
authorLuca Coelho <luciano.coelho@intel.com>
Thu, 9 Aug 2018 10:51:08 +0000 (13:51 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Fri, 14 Dec 2018 11:04:44 +0000 (13:04 +0200)
The ht_params, nvm_ver, nvm_calib_ver and max_ht_ampdu_exponent
elements in 9000 devices are always the same.  Move them to the common
macro.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/cfg/9000.c patch | blob | history

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index d55fd23cafe6f021ff8942c8debbae52d656697f..baaaf2a5dc7b80884332a14924c06a4f7b2c65a9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -157,17 +157,18 @@ static const struct iwl_tt_params iwl9000_tt_params = {
        .min_umac_error_event_table = 0x800000,                         \
        .csr = &iwl_csr_v1,                                             \
        .d3_debug_data_base_addr = 0x401000,                            \
-       .d3_debug_data_length = 92 * 1024
+       .d3_debug_data_length = 92 * 1024,                              \
+       .ht_params = &iwl9000_ht_params,                                \
+       .nvm_ver = IWL9000_NVM_VERSION,                                 \
+       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,                      \
+       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
+
 
 const struct iwl_cfg iwl9160_2ac_cfg = {
        .name = "Intel(R) Dual Band Wireless AC 9160",
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9260_2ac_cfg = {
@@ -175,10 +176,6 @@ const struct iwl_cfg iwl9260_2ac_cfg = {
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9260_killer_2ac_cfg = {
@@ -186,10 +183,6 @@ const struct iwl_cfg iwl9260_killer_2ac_cfg = {
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9270_2ac_cfg = {
@@ -197,10 +190,6 @@ const struct iwl_cfg iwl9270_2ac_cfg = {
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9460_2ac_cfg = {
@@ -208,10 +197,6 @@ const struct iwl_cfg iwl9460_2ac_cfg = {
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9460_2ac_cfg_soc = {
@@ -220,10 +205,6 @@ const struct iwl_cfg iwl9460_2ac_cfg_soc = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
 };
@@ -234,10 +215,6 @@ const struct iwl_cfg iwl9461_2ac_cfg_soc = {
                .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
                .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
                IWL_DEVICE_9000,
-               .ht_params = &iwl9000_ht_params,
-               .nvm_ver = IWL9000_NVM_VERSION,
-               .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-               .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
                .integrated = true,
                .soc_latency = 5000,
 };
@@ -248,10 +225,6 @@ const struct iwl_cfg iwl9462_2ac_cfg_soc = {
                .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
                .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
                IWL_DEVICE_9000,
-               .ht_params = &iwl9000_ht_params,
-               .nvm_ver = IWL9000_NVM_VERSION,
-               .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-               .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
                .integrated = true,
                .soc_latency = 5000,
 };
@@ -261,10 +234,6 @@ const struct iwl_cfg iwl9560_2ac_cfg = {
        .fw_name_pre = IWL9260A_FW_PRE,
        .fw_name_pre_b_or_c_step = IWL9260B_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 };
 
 const struct iwl_cfg iwl9560_2ac_cfg_soc = {
@@ -273,10 +242,6 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
 };
@@ -287,10 +252,6 @@ const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
 };
@@ -301,10 +262,6 @@ const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
 };
@@ -315,10 +272,6 @@ const struct iwl_cfg iwl9460_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
@@ -330,10 +283,6 @@ const struct iwl_cfg iwl9461_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
@@ -345,10 +294,6 @@ const struct iwl_cfg iwl9462_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
@@ -360,10 +305,6 @@ const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
@@ -375,10 +316,6 @@ const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
@@ -390,10 +327,6 @@ const struct iwl_cfg iwl9560_killer_s_2ac_cfg_shared_clk = {
        .fw_name_pre_b_or_c_step = IWL9000B_FW_PRE,
        .fw_name_pre_rf_next_step = IWL9000RFB_FW_PRE,
        IWL_DEVICE_9000,
-       .ht_params = &iwl9000_ht_params,
-       .nvm_ver = IWL9000_NVM_VERSION,
-       .nvm_calib_ver = IWL9000_TX_POWER_VERSION,
-       .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
        .integrated = true,
        .soc_latency = 5000,
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
John Crispins staging tree