add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/net/wireless/intel/iwlwifi/cfg/5000.c
..
..
@@ -1,23 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /******************************************************************************
2
3
  *
3
4
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
4
5
  * Copyright(c) 2018 - 2019 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.
21
6
  *
22
7
  * Contact Information:
23
8
  *  Intel Linux Wireless <linuxwifi@intel.com>
..
..
@@ -82,16 +67,15 @@
82
67
 	.fw_name_pre = IWL5000_FW_PRE,				\
83
68
 	.ucode_api_max = IWL5000_UCODE_API_MAX,			\
84
69
 	.ucode_api_min = IWL5000_UCODE_API_MIN,			\
85
-	.device_family = IWL_DEVICE_FAMILY_5000,		\
70
+	.trans.device_family = IWL_DEVICE_FAMILY_5000,		\
86
71
 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
87
72
 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\
88
73
 	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\
89
74
 	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\
90
-	.base_params = &iwl5000_base_params,			\
75
+	.trans.base_params = &iwl5000_base_params,		\
91
76
 	.eeprom_params = &iwl5000_eeprom_params,		\
92
77
 	.led_mode = IWL_LED_BLINK,				\
93
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
94
-	.csr = &iwl_csr_v1
78
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
95
79
 
96
80
 const struct iwl_cfg iwl5300_agn_cfg = {
97
81
 	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
..
..
@@ -130,34 +114,32 @@
130
114
 	.fw_name_pre = IWL5000_FW_PRE,
131
115
 	.ucode_api_max = IWL5000_UCODE_API_MAX,
132
116
 	.ucode_api_min = IWL5000_UCODE_API_MIN,
133
-	.device_family = IWL_DEVICE_FAMILY_5000,
117
+	.trans.device_family = IWL_DEVICE_FAMILY_5000,
134
118
 	.max_inst_size = IWLAGN_RTC_INST_SIZE,
135
119
 	.max_data_size = IWLAGN_RTC_DATA_SIZE,
136
120
 	.nvm_ver = EEPROM_5050_EEPROM_VERSION,
137
121
 	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,
138
-	.base_params = &iwl5000_base_params,
122
+	.trans.base_params = &iwl5000_base_params,
139
123
 	.eeprom_params = &iwl5000_eeprom_params,
140
124
 	.ht_params = &iwl5000_ht_params,
141
125
 	.led_mode = IWL_LED_BLINK,
142
126
 	.internal_wimax_coex = true,
143
-	.csr = &iwl_csr_v1,
144
127
 };
145
128
 
146
129
 #define IWL_DEVICE_5150						\
147
130
 	.fw_name_pre = IWL5150_FW_PRE,				\
148
131
 	.ucode_api_max = IWL5150_UCODE_API_MAX,			\
149
132
 	.ucode_api_min = IWL5150_UCODE_API_MIN,			\
150
-	.device_family = IWL_DEVICE_FAMILY_5150,		\
133
+	.trans.device_family = IWL_DEVICE_FAMILY_5150,		\
151
134
 	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\
152
135
 	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\
153
136
 	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\
154
137
 	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\
155
-	.base_params = &iwl5000_base_params,			\
138
+	.trans.base_params = &iwl5000_base_params,		\
156
139
 	.eeprom_params = &iwl5000_eeprom_params,		\
157
140
 	.led_mode = IWL_LED_BLINK,				\
158
141
 	.internal_wimax_coex = true,				\
159
-	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\
160
-	.csr = &iwl_csr_v1
142
+	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K
161
143
 
162
144
 const struct iwl_cfg iwl5150_agn_cfg = {
163
145
 	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",