forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c 
 kernel/drivers/net/wireless/intel/iwlwifi/cfg/2000.c
....@@ -1,23 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /******************************************************************************
23  *
34  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
4
- * Copyright(c) 2018 Intel Corporation
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of version 2 of the GNU General Public License as
8
- * published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
13
- * more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along with
16
- * this program; if not, write to the Free Software Foundation, Inc.,
17
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
18
- *
19
- * The full GNU General Public License is included in this distribution in the
20
- * file called LICENSE.
5
+ * Copyright(c) 2018 - 2019 Intel Corporation
216  *
227  * Contact Information:
238  *  Intel Linux Wireless <linuxwifi@intel.com>
....@@ -61,7 +46,7 @@
6146 #define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"
6247 
6348 static const struct iwl_base_params iwl2000_base_params = {
64
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
49
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
6550 	.num_of_queues = IWLAGN_NUM_QUEUES,
6651 	.max_tfd_queue_size = 256,
6752 	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
....@@ -75,7 +60,7 @@
7560 
7661 
7762 static const struct iwl_base_params iwl2030_base_params = {
78
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
63
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
7964 	.num_of_queues = IWLAGN_NUM_QUEUES,
8065 	.max_tfd_queue_size = 256,
8166 	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
....@@ -110,16 +95,15 @@
11095 	.fw_name_pre = IWL2000_FW_PRE,				\
11196 	.ucode_api_max = IWL2000_UCODE_API_MAX,			\
11297 	.ucode_api_min = IWL2000_UCODE_API_MIN,			\
113
-	.device_family = IWL_DEVICE_FAMILY_2000,		\
98
+	.trans.device_family = IWL_DEVICE_FAMILY_2000,		\
11499 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
115100 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
116101 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\
117102 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\
118
-	.base_params = &iwl2000_base_params,			\
103
+	.trans.base_params = &iwl2000_base_params,		\
119104 	.eeprom_params = &iwl20x0_eeprom_params,		\
120105 	.led_mode = IWL_LED_RF_STATE,				\
121
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
122
-	.csr = &iwl_csr_v1
106
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
123107 
124108 
125109 const struct iwl_cfg iwl2000_2bgn_cfg = {
....@@ -138,16 +122,15 @@
138122 	.fw_name_pre = IWL2030_FW_PRE,				\
139123 	.ucode_api_max = IWL2030_UCODE_API_MAX,			\
140124 	.ucode_api_min = IWL2030_UCODE_API_MIN,			\
141
-	.device_family = IWL_DEVICE_FAMILY_2030,		\
125
+	.trans.device_family = IWL_DEVICE_FAMILY_2030,		\
142126 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
143127 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
144128 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\
145129 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\
146
-	.base_params = &iwl2030_base_params,			\
130
+	.trans.base_params = &iwl2030_base_params,		\
147131 	.eeprom_params = &iwl20x0_eeprom_params,		\
148132 	.led_mode = IWL_LED_RF_STATE,				\
149
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
150
-	.csr = &iwl_csr_v1
133
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
151134 
152135 const struct iwl_cfg iwl2030_2bgn_cfg = {
153136 	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
....@@ -159,17 +142,16 @@
159142 	.fw_name_pre = IWL105_FW_PRE,				\
160143 	.ucode_api_max = IWL105_UCODE_API_MAX,			\
161144 	.ucode_api_min = IWL105_UCODE_API_MIN,			\
162
-	.device_family = IWL_DEVICE_FAMILY_105,			\
145
+	.trans.device_family = IWL_DEVICE_FAMILY_105,		\
163146 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
164147 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
165148 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\
166149 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\
167
-	.base_params = &iwl2000_base_params,			\
150
+	.trans.base_params = &iwl2000_base_params,		\
168151 	.eeprom_params = &iwl20x0_eeprom_params,		\
169152 	.led_mode = IWL_LED_RF_STATE,				\
170153 	.rx_with_siso_diversity = true,				\
171
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
172
-	.csr = &iwl_csr_v1
154
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
173155 
174156 const struct iwl_cfg iwl105_bgn_cfg = {
175157 	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
....@@ -187,17 +169,16 @@
187169 	.fw_name_pre = IWL135_FW_PRE,				\
188170 	.ucode_api_max = IWL135_UCODE_API_MAX,			\
189171 	.ucode_api_min = IWL135_UCODE_API_MIN,			\
190
-	.device_family = IWL_DEVICE_FAMILY_135,			\
172
+	.trans.device_family = IWL_DEVICE_FAMILY_135,		\
191173 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
192174 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
193175 	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\
194176 	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\
195
-	.base_params = &iwl2030_base_params,			\
177
+	.trans.base_params = &iwl2030_base_params,		\
196178 	.eeprom_params = &iwl20x0_eeprom_params,		\
197179 	.led_mode = IWL_LED_RF_STATE,				\
198180 	.rx_with_siso_diversity = true,				\
199
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
200
-	.csr = &iwl_csr_v1
181
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
201182 
202183 const struct iwl_cfg iwl135_bgn_cfg = {
203184 	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",