forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811 
 kernel/drivers/net/wireless/intel/iwlwifi/cfg/6000.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>
....@@ -70,7 +55,7 @@
7055 #define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"
7156 
7257 static const struct iwl_base_params iwl6000_base_params = {
73
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
58
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
7459 	.num_of_queues = IWLAGN_NUM_QUEUES,
7560 	.max_tfd_queue_size = 256,
7661 	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
....@@ -83,7 +68,7 @@
8368 };
8469 
8570 static const struct iwl_base_params iwl6050_base_params = {
86
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
71
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
8772 	.num_of_queues = IWLAGN_NUM_QUEUES,
8873 	.max_tfd_queue_size = 256,
8974 	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
....@@ -96,7 +81,7 @@
9681 };
9782 
9883 static const struct iwl_base_params iwl6000_g2_base_params = {
99
-	.eeprom_size = OTP_LOW_IMAGE_SIZE,
84
+	.eeprom_size = OTP_LOW_IMAGE_SIZE_2K,
10085 	.num_of_queues = IWLAGN_NUM_QUEUES,
10186 	.max_tfd_queue_size = 256,
10287 	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
....@@ -131,16 +116,15 @@
131116 	.fw_name_pre = IWL6005_FW_PRE,				\
132117 	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\
133118 	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\
134
-	.device_family = IWL_DEVICE_FAMILY_6005,		\
119
+	.trans.device_family = IWL_DEVICE_FAMILY_6005,		\
135120 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
136121 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
137122 	.nvm_ver = EEPROM_6005_EEPROM_VERSION,		\
138123 	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\
139
-	.base_params = &iwl6000_g2_base_params,			\
124
+	.trans.base_params = &iwl6000_g2_base_params,		\
140125 	.eeprom_params = &iwl6000_eeprom_params,		\
141126 	.led_mode = IWL_LED_RF_STATE,				\
142
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
143
-	.csr = &iwl_csr_v1
127
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
144128 
145129 const struct iwl_cfg iwl6005_2agn_cfg = {
146130 	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
....@@ -186,16 +170,15 @@
186170 	.fw_name_pre = IWL6030_FW_PRE,				\
187171 	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\
188172 	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\
189
-	.device_family = IWL_DEVICE_FAMILY_6030,		\
173
+	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\
190174 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
191175 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
192176 	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\
193177 	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\
194
-	.base_params = &iwl6000_g2_base_params,			\
178
+	.trans.base_params = &iwl6000_g2_base_params,		\
195179 	.eeprom_params = &iwl6000_eeprom_params,		\
196180 	.led_mode = IWL_LED_RF_STATE,				\
197
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
198
-	.csr = &iwl_csr_v1
181
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
199182 
200183 const struct iwl_cfg iwl6030_2agn_cfg = {
201184 	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
....@@ -223,16 +206,15 @@
223206 	.fw_name_pre = IWL6030_FW_PRE,				\
224207 	.ucode_api_max = IWL6035_UCODE_API_MAX,			\
225208 	.ucode_api_min = IWL6035_UCODE_API_MIN,			\
226
-	.device_family = IWL_DEVICE_FAMILY_6030,		\
209
+	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\
227210 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
228211 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
229212 	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\
230213 	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\
231
-	.base_params = &iwl6000_g2_base_params,			\
214
+	.trans.base_params = &iwl6000_g2_base_params,		\
232215 	.eeprom_params = &iwl6000_eeprom_params,		\
233216 	.led_mode = IWL_LED_RF_STATE,				\
234
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
235
-	.csr = &iwl_csr_v1
217
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
236218 
237219 const struct iwl_cfg iwl6035_2agn_cfg = {
238220 	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
....@@ -277,18 +259,17 @@
277259 	.fw_name_pre = IWL6000_FW_PRE,				\
278260 	.ucode_api_max = IWL6000_UCODE_API_MAX,			\
279261 	.ucode_api_min = IWL6000_UCODE_API_MIN,			\
280
-	.device_family = IWL_DEVICE_FAMILY_6000i,		\
262
+	.trans.device_family = IWL_DEVICE_FAMILY_6000i,		\
281263 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
282264 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
283265 	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\
284266 	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\
285267 	.nvm_ver = EEPROM_6000_EEPROM_VERSION,		\
286268 	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\
287
-	.base_params = &iwl6000_base_params,			\
269
+	.trans.base_params = &iwl6000_base_params,		\
288270 	.eeprom_params = &iwl6000_eeprom_params,		\
289271 	.led_mode = IWL_LED_BLINK,				\
290
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
291
-	.csr = &iwl_csr_v1
272
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
292273 
293274 const struct iwl_cfg iwl6000i_2agn_cfg = {
294275 	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
....@@ -310,19 +291,18 @@
310291 	.fw_name_pre = IWL6050_FW_PRE,				\
311292 	.ucode_api_max = IWL6050_UCODE_API_MAX,			\
312293 	.ucode_api_min = IWL6050_UCODE_API_MIN,			\
313
-	.device_family = IWL_DEVICE_FAMILY_6050,		\
294
+	.trans.device_family = IWL_DEVICE_FAMILY_6050,		\
314295 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
315296 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
316297 	.valid_tx_ant = ANT_AB,		/* .cfg overwrite */	\
317298 	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */	\
318299 	.nvm_ver = EEPROM_6050_EEPROM_VERSION,		\
319300 	.nvm_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\
320
-	.base_params = &iwl6050_base_params,			\
301
+	.trans.base_params = &iwl6050_base_params,		\
321302 	.eeprom_params = &iwl6000_eeprom_params,		\
322303 	.led_mode = IWL_LED_BLINK,				\
323304 	.internal_wimax_coex = true,				\
324
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
325
-	.csr = &iwl_csr_v1
305
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
326306 
327307 const struct iwl_cfg iwl6050_2agn_cfg = {
328308 	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
....@@ -339,17 +319,16 @@
339319 	.fw_name_pre = IWL6050_FW_PRE,				\
340320 	.ucode_api_max = IWL6050_UCODE_API_MAX,			\
341321 	.ucode_api_min = IWL6050_UCODE_API_MIN,			\
342
-	.device_family = IWL_DEVICE_FAMILY_6150,		\
322
+	.trans.device_family = IWL_DEVICE_FAMILY_6150,		\
343323 	.max_inst_size = IWL60_RTC_INST_SIZE,			\
344324 	.max_data_size = IWL60_RTC_DATA_SIZE,			\
345325 	.nvm_ver = EEPROM_6150_EEPROM_VERSION,		\
346326 	.nvm_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\
347
-	.base_params = &iwl6050_base_params,			\
327
+	.trans.base_params = &iwl6050_base_params,		\
348328 	.eeprom_params = &iwl6000_eeprom_params,		\
349329 	.led_mode = IWL_LED_BLINK,				\
350330 	.internal_wimax_coex = true,				\
351
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
352
-	.csr = &iwl_csr_v1
331
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
353332 
354333 const struct iwl_cfg iwl6150_bgn_cfg = {
355334 	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",
....@@ -367,16 +346,15 @@
367346 	.fw_name_pre = IWL6000_FW_PRE,
368347 	.ucode_api_max = IWL6000_UCODE_API_MAX,
369348 	.ucode_api_min = IWL6000_UCODE_API_MIN,
370
-	.device_family = IWL_DEVICE_FAMILY_6000,
349
+	.trans.device_family = IWL_DEVICE_FAMILY_6000,
371350 	.max_inst_size = IWL60_RTC_INST_SIZE,
372351 	.max_data_size = IWL60_RTC_DATA_SIZE,
373352 	.nvm_ver = EEPROM_6000_EEPROM_VERSION,
374353 	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,
375
-	.base_params = &iwl6000_base_params,
354
+	.trans.base_params = &iwl6000_base_params,
376355 	.eeprom_params = &iwl6000_eeprom_params,
377356 	.ht_params = &iwl6000_ht_params,
378357 	.led_mode = IWL_LED_BLINK,
379
-	.csr = &iwl_csr_v1,
380358 };
381359 
382360 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));