forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/include/bcmdevs.h
....@@ -1,15 +1,16 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
21 /*
32  * Broadcom device-specific manifest constants.
43  *
5
- * Copyright (C) 1999-2019, Broadcom Corporation
6
- * 
4
+ * Portions of this code are copyright (c) 2022 Cypress Semiconductor Corporation
5
+ *
6
+ * Copyright (C) 1999-2017, Broadcom Corporation
7
+ *
78  *      Unless you and Broadcom execute a separate written software license
89  * agreement governing use of this software, this software is licensed to you
910  * under the terms of the GNU General Public License version 2 (the "GPL"),
1011  * available at http://www.broadcom.com/licenses/GPLv2.php, with the
1112  * following added to such license:
12
- * 
13
+ *
1314  *      As a special exception, the copyright holders of this software give you
1415  * permission to link this software with independent modules, and to copy and
1516  * distribute the resulting executable under terms of your choice, provided that
....@@ -17,7 +18,7 @@
1718  * the license of that module.  An independent module is a module which is not
1819  * derived from this software.  The special exception does not apply to any
1920  * modifications of the software.
20
- * 
21
+ *
2122  *      Notwithstanding the above, under no circumstances may you combine this
2223  * software in any way with any other Broadcom software provided under a license
2324  * other than the GPL, without Broadcom's express prior written consent.
....@@ -25,7 +26,7 @@
2526  *
2627  * <<Broadcom-WL-IPTag/Open:>>
2728  *
28
- * $Id: bcmdevs.h 708808 2018-11-27 03:12:35Z $
29
+ * $Id: bcmdevs.h 701163 2017-05-23 22:21:03Z $
2930  */
3031 
3132 #ifndef	_BCMDEVS_H
....@@ -47,7 +48,7 @@
4748 #define VENDOR_TI		0x104c		/* Texas Instruments */
4849 #define VENDOR_RICOH		0x1180		/* Ricoh */
4950 #define VENDOR_JMICRON		0x197b
50
-
51
+#define VENDOR_CYPRESS		0x12BE
5152 
5253 /* PCMCIA vendor IDs */
5354 #define	VENDOR_BROADCOM_PCMCIA	0x02d0
....@@ -56,38 +57,35 @@
5657 #define	VENDOR_BROADCOM_SDIO	0x00BF
5758 
5859 /* DONGLE VID/PIDs */
59
-#define CY_DNGL_VID             0x04b4
60
+#define CY_DNGL_VID		0x04b4
6061 #define BCM_DNGL_VID		0x0a5c
6162 #define BCM_DNGL_BL_PID_4328	0xbd12
6263 #define BCM_DNGL_BL_PID_4322	0xbd13
6364 #define BCM_DNGL_BL_PID_4319    0xbd16
6465 #define BCM_DNGL_BL_PID_43236   0xbd17
6566 #define BCM_DNGL_BL_PID_4332	0xbd18
66
-#define BCM_DNGL_BL_PID_4330	0xbd19
67
-#define BCM_DNGL_BL_PID_4334	0xbd1a
68
-#define BCM_DNGL_BL_PID_43239   0xbd1b
69
-#define BCM_DNGL_BL_PID_4324	0xbd1c
7067 #define BCM_DNGL_BL_PID_4360	0xbd1d
7168 #define BCM_DNGL_BL_PID_43143	0xbd1e
72
-#define BCM_DNGL_BL_PID_43242	0xbd1f
73
-#define BCM_DNGL_BL_PID_43342	0xbd21
7469 #define BCM_DNGL_BL_PID_4335	0xbd20
75
-#define BCM_DNGL_BL_PID_43341	0xbd22
7670 #define BCM_DNGL_BL_PID_4350    0xbd23
7771 #define BCM_DNGL_BL_PID_4345    0xbd24
7872 #define BCM_DNGL_BL_PID_4349	0xbd25
7973 #define BCM_DNGL_BL_PID_4354	0xbd26
8074 #define BCM_DNGL_BL_PID_43569   0xbd27
81
-#define BCM_DNGL_BL_PID_43909	0xbd28
82
-#define BCM_DNGL_BL_PID_4373    0xbd29
75
+#define BCM_DNGL_BL_PID_4373	0xbd29
8376 
8477 #define BCM_DNGL_BDC_PID	0x0bdc
8578 #define BCM_DNGL_JTAG_PID	0x4a44
8679 
87
-/* HW USB BLOCK [CPULESS USB] PIDs */
88
-#define BCM_HWUSB_PID_43239     43239
80
+#ifdef DEPRECATED
81
+#define BCM_DNGL_BL_PID_43239   0xbd1b
82
+#define BCM_DNGL_BL_PID_4324	0xbd1c
83
+#define BCM_DNGL_BL_PID_43242	0xbd1f
84
+#define BCM_DNGL_BL_PID_43909	0xbd28
85
+#endif // endif
8986 
9087 /* PCI Device IDs */
88
+#ifdef DEPRECATED /* These products have been deprecated */
9189 #define	BCM4210_DEVICE_ID	0x1072		/* never used */
9290 #define	BCM4230_DEVICE_ID	0x1086		/* never used */
9391 #define	BCM4401_ENET_ID		0x170c		/* 4401b0 production enet cards */
....@@ -102,17 +100,12 @@
102100 #define	BCM4328_D11DUAL_ID	0x4314		/* 4328/4312 802.11a/g id */
103101 #define	BCM4328_D11G_ID		0x4315		/* 4328/4312 802.11g id */
104102 #define	BCM4328_D11A_ID		0x4316		/* 4328/4312 802.11a id */
105
-#define	BCM4318_D11G_ID		0x4318		/* 4318 802.11b/g id */
106
-#define	BCM4318_D11DUAL_ID	0x4319		/* 4318 802.11a/b/g id */
107103 #define	BCM4318_D11A_ID		0x431a		/* 4318 802.11a id */
108104 #define	BCM4325_D11DUAL_ID	0x431b		/* 4325 802.11a/g id */
109105 #define	BCM4325_D11G_ID		0x431c		/* 4325 802.11g id */
110106 #define	BCM4325_D11A_ID		0x431d		/* 4325 802.11a id */
111
-#define	BCM4306_D11G_ID		0x4320		/* 4306 802.11g */
112
-#define	BCM4306_D11A_ID		0x4321		/* 4306 802.11a */
113107 #define	BCM4306_UART_ID		0x4322		/* 4306 uart */
114108 #define	BCM4306_V90_ID		0x4323		/* 4306 v90 codec */
115
-#define	BCM4306_D11DUAL_ID	0x4324		/* 4306 dual A+B */
116109 #define	BCM4306_D11G_ID2	0x4325		/* BCM4306_D11G_ID; INF w/loose binding war */
117110 #define	BCM4321_D11N_ID		0x4328		/* 4321 802.11n dualband id */
118111 #define	BCM4321_D11N2G_ID	0x4329		/* 4321 802.11n 2.4Ghz band id */
....@@ -123,49 +116,32 @@
123116 #define BCM4329_D11N_ID		0x432e		/* 4329 802.11n dualband device */
124117 #define BCM4329_D11N2G_ID	0x432f		/* 4329 802.11n 2.4G device */
125118 #define BCM4329_D11N5G_ID	0x4330		/* 4329 802.11n 5G device */
119
+#define BCM4314_D11N2G_ID	0x4364		/* 4314 802.11n 2.4G device */
120
+#define BCM43143_D11N2G_ID	0x4366		/* 43143 802.11n 2.4G device */
126121 #define	BCM4315_D11DUAL_ID	0x4334		/* 4315 802.11a/g id */
127122 #define	BCM4315_D11G_ID		0x4335		/* 4315 802.11g id */
128123 #define	BCM4315_D11A_ID		0x4336		/* 4315 802.11a id */
129124 #define BCM4319_D11N_ID		0x4337		/* 4319 802.11n dualband device */
130125 #define BCM4319_D11N2G_ID	0x4338		/* 4319 802.11n 2.4G device */
131126 #define BCM4319_D11N5G_ID	0x4339		/* 4319 802.11n 5G device */
132
-#define BCM43231_D11N2G_ID	0x4340		/* 43231 802.11n 2.4GHz device */
133127 #define BCM43221_D11N2G_ID	0x4341		/* 43221 802.11n 2.4GHz device */
134128 #define BCM43222_D11N_ID	0x4350		/* 43222 802.11n dualband device */
135129 #define BCM43222_D11N2G_ID	0x4351		/* 43222 802.11n 2.4GHz device */
136130 #define BCM43222_D11N5G_ID	0x4352		/* 43222 802.11n 5GHz device */
137
-#define BCM43224_D11N_ID	0x4353		/* 43224 802.11n dualband device */
138
-#define BCM43224_D11N_ID_VEN1	0x0576		/* Vendor specific 43224 802.11n db device */
139
-#define BCM43226_D11N_ID	0x4354		/* 43226 802.11n dualband device */
140
-#define BCM43236_D11N_ID	0x4346		/* 43236 802.11n dualband device */
141
-#define BCM43236_D11N2G_ID	0x4347		/* 43236 802.11n 2.4GHz device */
142
-#define BCM43236_D11N5G_ID	0x4348		/* 43236 802.11n 5GHz device */
143131 #define BCM43225_D11N2G_ID	0x4357		/* 43225 802.11n 2.4GHz device */
144
-#define BCM43421_D11N_ID	0xA99D		/* 43421 802.11n dualband device */
145
-#define BCM4313_D11N2G_ID	0x4727		/* 4313 802.11n 2.4G device */
132
+#define BCM43226_D11N_ID	0x4354		/* 43226 802.11n dualband device */
133
+#define BCM43228_D11N5G_ID	0x435a		/* 43228 802.11n 5GHz device */
134
+#define BCM43231_D11N2G_ID	0x4340		/* 43231 802.11n 2.4GHz device */
135
+#define BCM43237_D11N_ID	0x4355		/* 43237 802.11n dualband device */
136
+#define BCM43237_D11N5G_ID	0x4356		/* 43237 802.11n 5GHz device */
137
+#define BCM43239_D11N_ID	0x4370		/* 43239 802.11n dualband device */
138
+#define BCM4324_D11N_ID		0x4374		/* 4324 802.11n dualband device */
139
+#define BCM43242_D11N_ID	0x4367		/* 43242 802.11n dualband device */
140
+#define BCM43242_D11N2G_ID	0x4368		/* 43242 802.11n 2.4G device */
141
+#define BCM43242_D11N5G_ID	0x4369		/* 43242 802.11n 5G device */
146142 #define BCM4330_D11N_ID         0x4360          /* 4330 802.11n dualband device */
147143 #define BCM4330_D11N2G_ID       0x4361          /* 4330 802.11n 2.4G device */
148144 #define BCM4330_D11N5G_ID       0x4362          /* 4330 802.11n 5G device */
149
-#define BCM4336_D11N_ID		0x4343		/* 4336 802.11n 2.4GHz device */
150
-#define BCM6362_D11N_ID		0x435f		/* 6362 802.11n dualband device */
151
-#define BCM6362_D11N2G_ID	0x433f		/* 6362 802.11n 2.4Ghz band id */
152
-#define BCM6362_D11N5G_ID	0x434f		/* 6362 802.11n 5Ghz band id */
153
-#define BCM4331_D11N_ID		0x4331		/* 4331 802.11n dualband id */
154
-#define BCM4331_D11N2G_ID	0x4332		/* 4331 802.11n 2.4Ghz band id */
155
-#define BCM4331_D11N5G_ID	0x4333		/* 4331 802.11n 5Ghz band id */
156
-#define BCM43237_D11N_ID	0x4355		/* 43237 802.11n dualband device */
157
-#define BCM43237_D11N5G_ID	0x4356		/* 43237 802.11n 5GHz device */
158
-#define BCM43227_D11N2G_ID	0x4358		/* 43228 802.11n 2.4GHz device */
159
-#define BCM43228_D11N_ID	0x4359		/* 43228 802.11n DualBand device */
160
-#define BCM43228_D11N5G_ID	0x435a		/* 43228 802.11n 5GHz device */
161
-#define BCM43362_D11N_ID	0x4363		/* 43362 802.11n 2.4GHz device */
162
-#define BCM43239_D11N_ID	0x4370		/* 43239 802.11n dualband device */
163
-#define BCM4324_D11N_ID		0x4374		/* 4324 802.11n dualband device */
164
-#define BCM43217_D11N2G_ID	0x43a9		/* 43217 802.11n 2.4GHz device */
165
-#define BCM43131_D11N2G_ID	0x43aa		/* 43131 802.11n 2.4GHz device */
166
-#define BCM4314_D11N2G_ID	0x4364		/* 4314 802.11n 2.4G device */
167
-#define BCM43142_D11N2G_ID	0x4365		/* 43142 802.11n 2.4G device */
168
-#define BCM43143_D11N2G_ID	0x4366		/* 43143 802.11n 2.4G device */
169145 #define BCM4334_D11N_ID		0x4380		/* 4334 802.11n dualband device */
170146 #define BCM4334_D11N2G_ID	0x4381		/* 4334 802.11n 2.4G device */
171147 #define BCM4334_D11N5G_ID	0x4382		/* 4334 802.11n 5G device */
....@@ -175,12 +151,47 @@
175151 #define BCM43341_D11N_ID	0x4386		/* 43341 802.11n dualband device */
176152 #define BCM43341_D11N2G_ID	0x4387		/* 43341 802.11n 2.4G device */
177153 #define BCM43341_D11N5G_ID	0x4388		/* 43341 802.11n 5G device */
154
+#define BCM4336_D11N_ID		0x4343		/* 4336 802.11n 2.4GHz device */
155
+#define BCM43362_D11N_ID	0x4363		/* 43362 802.11n 2.4GHz device */
156
+#define BCM43421_D11N_ID	0xA99D		/* 43421 802.11n dualband device */
157
+#define BCM43909_D11AC_ID	0x43d0		/* 43909 802.11ac dualband device */
158
+#define BCM43909_D11AC2G_ID	0x43d1		/* 43909 802.11ac 2.4G device */
159
+#define BCM43909_D11AC5G_ID	0x43d2		/* 43909 802.11ac 5G device */
160
+#endif /* DEPRECATED */
161
+/* DEPRECATED but used */
162
+#define	BCM4306_D11G_ID		0x4320		/* 4306 802.11g */
163
+#define	BCM4306_D11A_ID		0x4321		/* 4306 802.11a */
164
+#define	BCM4306_D11DUAL_ID	0x4324		/* 4306 dual A+B */
165
+#define BCM43142_D11N2G_ID	0x4365		/* 43142 802.11n 2.4G device */
166
+#define BCM4313_D11N2G_ID	0x4727		/* 4313 802.11n 2.4G device */
167
+#define	BCM4318_D11G_ID		0x4318		/* 4318 802.11b/g id */
168
+#define	BCM4318_D11DUAL_ID	0x4319		/* 4318 802.11a/b/g id */
169
+#define BCM43224_D11N_ID	0x4353		/* 43224 802.11n dualband device */
170
+#define BCM43224_D11N_ID_VEN1	0x0576		/* Vendor specific 43224 802.11n db device */
171
+#define BCM43227_D11N2G_ID	0x4358		/* 43228 802.11n 2.4GHz device */
172
+#define BCM43228_D11N_ID	0x4359		/* 43228 802.11n DualBand device */
173
+#define BCM4331_D11N_ID		0x4331		/* 4331 802.11n dualband id */
174
+#define BCM4331_D11N2G_ID	0x4332		/* 4331 802.11n 2.4Ghz band id */
175
+#define BCM4331_D11N5G_ID	0x4333		/* 4331 802.11n 5Ghz band id */
176
+/* DEPRECATED */
177
+
178
+#define BCM43236_D11N_ID	0x4346		/* 43236 802.11n dualband device */
179
+#define BCM43236_D11N2G_ID	0x4347		/* 43236 802.11n 2.4GHz device */
180
+#define BCM43236_D11N5G_ID	0x4348		/* 43236 802.11n 5GHz device */
181
+#define BCM6362_D11N_ID		0x435f		/* 6362 802.11n dualband device */
182
+#define BCM6362_D11N2G_ID	0x433f		/* 6362 802.11n 2.4Ghz band id */
183
+#define BCM6362_D11N5G_ID	0x434f		/* 6362 802.11n 5Ghz band id */
184
+#define BCM43217_D11N2G_ID	0x43a9		/* 43217 802.11n 2.4GHz device */
185
+#define BCM43131_D11N2G_ID	0x43aa		/* 43131 802.11n 2.4GHz device */
178186 #define BCM4360_D11AC_ID	0x43a0
179187 #define BCM4360_D11AC2G_ID	0x43a1
180188 #define BCM4360_D11AC5G_ID	0x43a2
181189 #define BCM4345_D11AC_ID	0x43ab		/* 4345 802.11ac dualband device */
182190 #define BCM4345_D11AC2G_ID	0x43ac		/* 4345 802.11ac 2.4G device */
183191 #define BCM4345_D11AC5G_ID	0x43ad		/* 4345 802.11ac 5G device */
192
+#define BCM43455_D11AC_ID	0x43e3		/* 43455 802.11ac dualband device */
193
+#define BCM43455_D11AC2G_ID	0x43e4		/* 43455 802.11ac 2.4G device */
194
+#define BCM43455_D11AC5G_ID	0x43e5		/* 43455 802.11ac 5G device */
184195 #define BCM4335_D11AC_ID	0x43ae
185196 #define BCM4335_D11AC2G_ID	0x43af
186197 #define BCM4335_D11AC5G_ID	0x43b0
....@@ -208,21 +219,20 @@
208219 #define BCM43596_D11AC_ID	0x4415		/* 43596 802.11ac dualband device */
209220 #define BCM43596_D11AC2G_ID	0x4416		/* 43596 802.11ac 2.4G device */
210221 #define BCM43596_D11AC5G_ID	0x4417		/* 43596 802.11ac 5G device */
211
-#define BCM43909_D11AC_ID	0x43d0		/* 43909 802.11ac dualband device */
212
-#define BCM43909_D11AC2G_ID	0x43d1		/* 43909 802.11ac 2.4G device */
213
-#define BCM43909_D11AC5G_ID	0x43d2		/* 43909 802.11ac 5G device */
222
+#define BCM43597_D11AC_ID	0x441c		/* 43597 802.11ac dualband device */
223
+#define BCM43597_D11AC2G_ID	0x441d		/* 43597 802.11ac 2.4G device */
224
+#define BCM43597_D11AC5G_ID	0x441e		/* 43597 802.11ac 5G device */
225
+#define BCM43012_D11N_ID	0xA804		/* 43012 802.11n dualband device */
226
+#define BCM43012_D11N2G_ID	0xA805		/* 43012 802.11n 2.4G device */
227
+#define BCM43012_D11N5G_ID	0xA806		/* 43012 802.11n 5G device */
228
+#define BCM43014_D11N_ID	0x4495		/* 43014 802.11n dualband device */
229
+#define BCM43014_D11N2G_ID	0x4496		/* 43014 802.11n 2.4G device */
230
+#define BCM43014_D11N5G_ID	0x4497		/* 43014 802.11n 5G device */
214231 
215232 /* PCI Subsystem ID */
216
-#define BCM943228HMB_SSID_VEN1	0x0607
217233 #define BCM94313HMGBL_SSID_VEN1	0x0608
218234 #define BCM94313HMG_SSID_VEN1	0x0609
219235 #define BCM943142HM_SSID_VEN1	0x0611
220
-
221
-#define BCM43143_D11N2G_ID	0x4366		/* 43143 802.11n 2.4G device */
222
-
223
-#define BCM43242_D11N_ID	0x4367		/* 43242 802.11n dualband device */
224
-#define BCM43242_D11N2G_ID	0x4368		/* 43242 802.11n 2.4G device */
225
-#define BCM43242_D11N5G_ID	0x4369		/* 43242 802.11n 5G device */
226236 
227237 #define BCM4350_D11AC_ID	0x43a3
228238 #define BCM4350_D11AC2G_ID	0x43a4
....@@ -256,7 +266,36 @@
256266 #define BCM4354_D11AC2G_ID	0x43e0		/* 4354 802.11ac 2.4G device */
257267 #define BCM4354_D11AC5G_ID	0x43e1		/* 4354 802.11ac 5G device */
258268 #define BCM43430_D11N2G_ID	0x43e2		/* 43430 802.11n 2.4G device */
269
+#define BCM43018_D11N2G_ID	0x441b		/* 43018 802.11n 2.4G device */
259270 
271
+#define BCM4347_D11AC_ID	0x440a		/* 4347 802.11ac dualband device */
272
+#define BCM4347_D11AC2G_ID	0x440b		/* 4347 802.11ac 2.4G device */
273
+#define BCM4347_D11AC5G_ID	0x440c		/* 4347 802.11ac 5G device */
274
+
275
+#ifdef CHIPS_CUSTOMER_HW6
276
+#define BCM4376_D11AC_ID	0x4435		/* 4376 802.11ac dualband device */
277
+#define BCM4376_D11AC2G_ID	0x4436		/* 4376 802.11ac 2.4G device */
278
+#define BCM4376_D11AC5G_ID	0x4437		/* 4376 802.11ac 5G device */
279
+
280
+#define BCM4378_D11AC_ID	0x4425		/* 4378 802.11ac dualband device */
281
+#define BCM4378_D11AC2G_ID	0x4426		/* 4378 802.11ac 2.4G device */
282
+#define BCM4378_D11AC5G_ID	0x4427		/* 4378 802.11ac 5G device */
283
+#endif /* CHIPS_CUSTOMER_HW6 */
284
+
285
+#define BCM4361_D11AC_ID	0x441f		/* 4361 802.11ac dualband device */
286
+#define BCM4361_D11AC2G_ID	0x4420		/* 4361 802.11ac 2.4G device */
287
+#define BCM4361_D11AC5G_ID	0x4421		/* 4361 802.11ac 5G device */
288
+
289
+#define BCM4362_D11AX_ID	0x4490		/* 4362 802.11ax dualband device */
290
+#define BCM4362_D11AX2G_ID	0x4491		/* 4362 802.11ax 2.4G device */
291
+#define BCM4362_D11AX5G_ID	0x4492		/* 4362 802.11ax 5G device */
292
+#define BCM43751_D11AX_ID	0x4490		/* 43751 802.11ax dualband device */
293
+#define BCM43751_D11AX2G_ID	0x4491		/* 43751 802.11ax 2.4G device */
294
+#define BCM43751_D11AX5G_ID	0x4492		/* 43751 802.11ax 5G device */
295
+
296
+#define BCM4364_D11AC_ID	0x4464		/* 4364 802.11ac dualband device */
297
+#define BCM4364_D11AC2G_ID	0x446a		/* 4364 802.11ac 2.4G device */
298
+#define BCM4364_D11AC5G_ID	0x446b		/* 4364 802.11ac 5G device */
260299 
261300 #define BCM4365_D11AC_ID	0x43ca
262301 #define BCM4365_D11AC2G_ID	0x43cb
....@@ -265,6 +304,35 @@
265304 #define BCM4366_D11AC_ID	0x43c3
266305 #define BCM4366_D11AC2G_ID	0x43c4
267306 #define BCM4366_D11AC5G_ID	0x43c5
307
+
308
+/* TBD change below values */
309
+#define BCM4369_D11AX_ID	0x4470		/* 4369 802.11ax dualband device */
310
+#define BCM4369_D11AX2G_ID	0x4471		/* 4369 802.11ax 2.4G device */
311
+#define BCM4369_D11AX5G_ID	0x4472		/* 4369 802.11ax 5G device */
312
+
313
+#define BCM4375_D11AX_ID	0x4475		/* 4375 802.11ax dualband device */
314
+#define BCM4375_D11AX2G_ID	0x4476		/* 4375 802.11ax 2.4G device */
315
+#define BCM4375_D11AX5G_ID	0x4477		/* 4375 802.11ax 5G device */
316
+
317
+#ifdef CHIPS_CUSTOMER_HW6
318
+#define BCM4377_D11AX_ID	0x4480		/* 4377 802.11ax dualband device */
319
+#define BCM4377_D11AX2G_ID	0x4481		/* 4377 802.11ax 2.4G device */
320
+#define BCM4377_D11AX5G_ID	0x4482		/* 4377 802.11ax 5G device */
321
+
322
+#define BCM4377_M_D11AX_ID	0x4488	/* 4377 802.11ax dualband device with multifunction */
323
+
324
+/* TBD change below values */
325
+#define BCM4367_D11AC_ID	0x4422
326
+#define BCM4367_D11AC2G_ID	0x4423
327
+#define BCM4367_D11AC5G_ID	0x4424
328
+#endif /* CHIPS_CUSTOMER_HW6 */
329
+
330
+#ifdef CHIPS_CUSTOMER_HW6
331
+#define BCM4368_D11AC_ID	0x442f
332
+#define BCM4368_D11AC2G_ID	0x4430
333
+#define BCM4368_D11AC5G_ID	0x4431
334
+#define BCM4368_D11ACBT_ID	0x5f30
335
+#endif /* CHIPS_CUSTOMER_HW6 */
268336 
269337 #define BCM43349_D11N_ID	0x43e6		/* 43349 802.11n dualband id */
270338 #define BCM43349_D11N2G_ID	0x43e7		/* 43349 802.11n 2.4Ghz band id */
....@@ -278,9 +346,20 @@
278346 #define BCM4356_D11AC2G_ID	0x43ed		/* 4356 802.11ac 2.4G device */
279347 #define BCM4356_D11AC5G_ID	0x43ee		/* 4356 802.11ac 5G device */
280348 
281
-#define BCM4373_D11AC_ID	0x4418		/* 4373 802.11ac dualband device */
282
-#define BCM4373_D11AC2G_ID	0x4419		/* 4373 802.11ac 2.4G device */
283
-#define BCM4373_D11AC5G_ID	0x441a		/* 4373 802.11ac 5G device */
349
+#define BCM4371_D11AC_ID	0x440d		/* 4371 802.11ac dualband device */
350
+#define BCM4371_D11AC2G_ID	0x440e		/* 4371 802.11ac 2.4G device */
351
+#define BCM4371_D11AC5G_ID	0x440f		/* 4371 802.11ac 5G device */
352
+#define BCM7271_D11AC_ID	0x4410		/* 7271 802.11ac dualband device */
353
+#define BCM7271_D11AC2G_ID	0x4411		/* 7271 802.11ac 2.4G device */
354
+#define BCM7271_D11AC5G_ID	0x4412		/* 7271 802.11ac 5G device */
355
+
356
+#define BCM4373_D11AC_ID	0x4418          /* 4373 802.11ac dualband device */
357
+#define BCM4373_D11AC2G_ID	0x4419          /* 4373 802.11ac 2.4G device */
358
+#define BCM4373_D11AC5G_ID	0x441a          /* 4373 802.11ac 5G device */
359
+
360
+#define CYW55560_WLAN_ID	0xBD31     /* CYW55560 802.11ax WLAN device ID */
361
+#define CYW89570_WLAN_ID	0xBD3f     /* CYW89570 802.11ax WLAN device ID */
362
+#define CYW55560_BT_ID		0xBD37     /* CYW55560 802.11ax BT device ID */
284363 
285364 #define	BCMGPRS_UART_ID		0x4333		/* Uart id used by 4306/gprs card */
286365 #define	BCMGPRS2_UART_ID	0x4344		/* Uart id used by 4306/gprs card */
....@@ -316,11 +395,13 @@
316395 #define	BCM47XX_ATA100_ID	0x471d		/* 47xx parallel ATA */
317396 #define	BCM47XX_SATAXOR_ID	0x471e		/* 47xx serial ATA & XOR DMA */
318397 #define	BCM47XX_GIGETH_ID	0x471f		/* 47xx GbE (5700) */
398
+#ifdef DEPRECATED /* These products have been deprecated */
319399 #define	BCM4712_MIPS_ID		0x4720		/* 4712 base devid */
320400 #define	BCM4716_DEVICE_ID	0x4722		/* 4716 base devid */
401
+#endif /* DEPRECATED */
321402 #define	BCM47XX_USB30H_ID	0x472a		/* 47xx usb 3.0 host */
322403 #define	BCM47XX_USB30D_ID	0x472b		/* 47xx usb 3.0 device */
323
-#define BCM47XX_USBHUB_ID	0x472c		/* 47xx usb hub */
404
+#define	BCM47XX_USBHUB_ID	0x472c		/* 47xx usb hub */
324405 #define BCM47XX_SMBUS_EMU_ID	0x47fe		/* 47xx emulated SMBus device */
325406 #define	BCM47XX_XOR_EMU_ID	0x47ff		/* 47xx emulated XOR engine */
326407 #define	EPI41210_DEVICE_ID	0xa0fa		/* bcm4210 */
....@@ -332,80 +413,101 @@
332413 #define R5C822_SDIOH_ID		0x0822		/* Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host */
333414 #define JMICRON_SDIOH_ID	0x2381		/* JMicron Standard SDIO Host Controller */
334415 
416
+#define BCM43452_D11AC_ID	0x47ab		/* 43452 802.11ac dualband device */
417
+#define BCM43452_D11AC2G_ID	0x47ac		/* 43452 802.11ac 2.4G device */
418
+#define BCM43452_D11AC5G_ID	0x47ad		/* 43452 802.11ac 5G device */
419
+
335420 /* Chip IDs */
421
+#ifdef DEPRECATED /* These products have been deprecated */
336422 #define	BCM4306_CHIP_ID		0x4306		/* 4306 chipcommon chipid */
337423 #define	BCM4311_CHIP_ID		0x4311		/* 4311 PCIe 802.11a/b/g */
338424 #define	BCM43111_CHIP_ID	43111		/* 43111 chipcommon chipid (OTP chipid) */
339425 #define	BCM43112_CHIP_ID	43112		/* 43112 chipcommon chipid (OTP chipid) */
340426 #define	BCM4312_CHIP_ID		0x4312		/* 4312 chipcommon chipid */
427
+#define BCM4314_CHIP_ID		0x4314		/* 4314 chipcommon chipid */
428
+#define BCM43142_CHIP_ID	43142		/* 43142 chipcommon chipid */
429
+#define BCM43143_CHIP_ID	43143		/* 43143 chipcommon chipid */
341430 #define BCM4313_CHIP_ID		0x4313		/* 4313 chip id */
342
-#define	BCM43131_CHIP_ID	43131		/* 43131 chip id (OTP chipid) */
343431 #define	BCM4315_CHIP_ID		0x4315		/* 4315 chip id */
344432 #define	BCM4318_CHIP_ID		0x4318		/* 4318 chipcommon chipid */
345433 #define	BCM4319_CHIP_ID		0x4319		/* 4319 chip id */
346434 #define	BCM4320_CHIP_ID		0x4320		/* 4320 chipcommon chipid */
347435 #define	BCM4321_CHIP_ID		0x4321		/* 4321 chipcommon chipid */
348
-#define	BCM43217_CHIP_ID	43217		/* 43217 chip id (OTP chipid) */
349436 #define	BCM4322_CHIP_ID		0x4322		/* 4322 chipcommon chipid */
350437 #define	BCM43221_CHIP_ID	43221		/* 43221 chipcommon chipid (OTP chipid) */
351438 #define	BCM43222_CHIP_ID	43222		/* 43222 chipcommon chipid */
352439 #define	BCM43224_CHIP_ID	43224		/* 43224 chipcommon chipid */
353440 #define	BCM43225_CHIP_ID	43225		/* 43225 chipcommon chipid */
441
+#define	BCM43226_CHIP_ID	43226		/* 43226 chipcommon chipid */
354442 #define	BCM43227_CHIP_ID	43227		/* 43227 chipcommon chipid */
355443 #define	BCM43228_CHIP_ID	43228		/* 43228 chipcommon chipid */
356
-#define	BCM43226_CHIP_ID	43226		/* 43226 chipcommon chipid */
357444 #define	BCM43231_CHIP_ID	43231		/* 43231 chipcommon chipid (OTP chipid) */
358
-#define	BCM43234_CHIP_ID	43234		/* 43234 chipcommon chipid */
359
-#define	BCM43235_CHIP_ID	43235		/* 43235 chipcommon chipid */
360
-#define	BCM43236_CHIP_ID	43236		/* 43236 chipcommon chipid */
361445 #define	BCM43237_CHIP_ID	43237		/* 43237 chipcommon chipid */
362
-#define	BCM43238_CHIP_ID	43238		/* 43238 chipcommon chipid */
363446 #define	BCM43239_CHIP_ID	43239		/* 43239 chipcommon chipid */
364
-#define	BCM43420_CHIP_ID	43420		/* 43222 chipcommon chipid (OTP, RBBU) */
365
-#define	BCM43421_CHIP_ID	43421		/* 43224 chipcommon chipid (OTP, RBBU) */
366
-#define	BCM43428_CHIP_ID	43428		/* 43228 chipcommon chipid (OTP, RBBU) */
367
-#define	BCM43431_CHIP_ID	43431		/* 4331  chipcommon chipid (OTP, RBBU) */
368
-#define	BCM43460_CHIP_ID	43460		/* 4360  chipcommon chipid (OTP, RBBU) */
447
+#define	BCM4324_CHIP_ID		0x4324		/* 4324 chipcommon chipid */
448
+#define	BCM43242_CHIP_ID	43242		/* 43242 chipcommon chipid */
449
+#define	BCM43243_CHIP_ID	43243		/* 43243 chipcommon chipid */
369450 #define	BCM4325_CHIP_ID		0x4325		/* 4325 chip id */
370451 #define	BCM4328_CHIP_ID		0x4328		/* 4328 chip id */
371452 #define	BCM4329_CHIP_ID		0x4329		/* 4329 chipcommon chipid */
372453 #define	BCM4331_CHIP_ID		0x4331		/* 4331 chipcommon chipid */
373
-#define BCM4336_CHIP_ID		0x4336		/* 4336 chipcommon chipid */
374
-#define BCM43362_CHIP_ID	43362		/* 43362 chipcommon chipid */
375
-#define BCM4330_CHIP_ID		0x4330		/* 4330 chipcommon chipid */
376
-#define BCM6362_CHIP_ID		0x6362		/* 6362 chipcommon chipid */
377
-#define BCM4314_CHIP_ID		0x4314		/* 4314 chipcommon chipid */
378
-#define BCM43142_CHIP_ID	43142		/* 43142 chipcommon chipid */
379
-#define BCM43143_CHIP_ID	43143		/* 43143 chipcommon chipid */
380
-#define	BCM4324_CHIP_ID		0x4324		/* 4324 chipcommon chipid */
381
-#define	BCM43242_CHIP_ID	43242		/* 43242 chipcommon chipid */
382
-#define	BCM43243_CHIP_ID	43243		/* 43243 chipcommon chipid */
383454 #define BCM4334_CHIP_ID		0x4334		/* 4334 chipcommon chipid */
455
+#define BCM43349_CHIP_ID	43349		/* 43349(0xA955) chipcommon chipid */
456
+#define BCM43340_CHIP_ID	43340		/* 43340 chipcommon chipid */
457
+#define BCM43341_CHIP_ID	43341		/* 43341 chipcommon chipid */
458
+#define BCM43342_CHIP_ID	43342		/* 43342 chipcommon chipid */
459
+#define	BCM4342_CHIP_ID		4342		/* 4342 chipcommon chipid (OTP, RBBU) */
460
+#define	BCM43420_CHIP_ID	43420		/* 43420 chipcommon chipid (OTP, RBBU) */
461
+#define	BCM43421_CHIP_ID	43421		/* 43224 chipcommon chipid (OTP, RBBU) */
462
+#define	BCM43431_CHIP_ID	43431		/* 4331  chipcommon chipid (OTP, RBBU) */
463
+#define BCM43909_CHIP_ID	0xab85		/* 43909 chipcommon chipid */
464
+#define	BCM4712_CHIP_ID		0x4712		/* 4712 chipcommon chipid */
465
+#define	BCM4716_CHIP_ID		0x4716		/* 4716 chipcommon chipid */
466
+#define	BCM4748_CHIP_ID		0x4748		/* 4716 chipcommon chipid (OTP, RBBU) */
467
+#endif /* DEPRECATED */
468
+
469
+/* DEPRECATED but still referenced in components - start */
470
+#define	BCM47162_CHIP_ID	47162		/* 47162 chipcommon chipid */
471
+#define	BCM5354_CHIP_ID		0x5354		/* 5354 chipcommon chipid */
472
+/* DEPRECATED but still referenced in components - end */
473
+
474
+#define	BCM43217_CHIP_ID	43217		/* 43217 chip id (OTP chipid) */
475
+#define	BCM43131_CHIP_ID	43131		/* 43131 chip id (OTP chipid) */
476
+#define	BCM43234_CHIP_ID	43234		/* 43234 chipcommon chipid */
477
+#define	BCM43235_CHIP_ID	43235		/* 43235 chipcommon chipid */
478
+#define	BCM43236_CHIP_ID	43236		/* 43236 chipcommon chipid */
479
+#define	BCM43238_CHIP_ID	43238		/* 43238 chipcommon chipid */
480
+#define	BCM43428_CHIP_ID	43428		/* 43228 chipcommon chipid (OTP, RBBU) */
481
+#define	BCM43460_CHIP_ID	43460		/* 4360  chipcommon chipid (OTP, RBBU) */
482
+#define	BCM43465_CHIP_ID	43465		/* 4366  chipcommon chipid (OTP, RBBU) */
483
+#define	BCM43525_CHIP_ID	43525		/* 4365  chipcommon chipid (OTP, RBBU) */
484
+#define	BCM47452_CHIP_ID	47452		/* 53573 chipcommon chipid (OTP, RBBU) */
485
+#define BCM6362_CHIP_ID		0x6362		/* 6362 chipcommon chipid */
384486 #define BCM4335_CHIP_ID		0x4335		/* 4335 chipcommon chipid */
385487 #define BCM4339_CHIP_ID		0x4339		/* 4339 chipcommon chipid */
386
-#define BCM43349_CHIP_ID	43349			/* 43349(0xA955) chipcommon chipid */
387488 #define BCM4360_CHIP_ID		0x4360          /* 4360 chipcommon chipid */
388489 #define BCM4364_CHIP_ID		0x4364			/* 4364 chipcommon chipid */
389490 #define BCM4352_CHIP_ID		0x4352          /* 4352 chipcommon chipid */
390491 #define BCM43526_CHIP_ID	0xAA06
391
-#define BCM43340_CHIP_ID	43340		/* 43340 chipcommon chipid */
392
-#define BCM43341_CHIP_ID	43341		/* 43341 chipcommon chipid */
393
-#define BCM43342_CHIP_ID	43342		/* 43342 chipcommon chipid */
394492 #define BCM4350_CHIP_ID		0x4350          /* 4350 chipcommon chipid */
395493 #define BCM4354_CHIP_ID		0x4354          /* 4354 chipcommon chipid */
396494 #define BCM4356_CHIP_ID		0x4356          /* 4356 chipcommon chipid */
495
+#define BCM4371_CHIP_ID		0x4371          /* 4371 chipcommon chipid */
397496 #define BCM43556_CHIP_ID	0xAA24          /* 43556 chipcommon chipid */
398497 #define BCM43558_CHIP_ID	0xAA26          /* 43558 chipcommon chipid */
498
+#define BCM43562_CHIP_ID	0xAA2A		/* 43562 chipcommon chipid */
399499 #define BCM43566_CHIP_ID	0xAA2E          /* 43566 chipcommon chipid */
400500 #define BCM43567_CHIP_ID	0xAA2F          /* 43567 chipcommon chipid */
401501 #define BCM43568_CHIP_ID	0xAA30          /* 43568 chipcommon chipid */
402502 #define BCM43569_CHIP_ID	0xAA31          /* 43569 chipcommon chipid */
403503 #define BCM43570_CHIP_ID	0xAA32          /* 43570 chipcommon chipid */
404
-#define BCM4358_CHIP_ID         0x4358          /* 4358 chipcommon chipid */
504
+#define BCM4358_CHIP_ID		0x4358          /* 4358 chipcommon chipid */
405505 #define	BCM43012_CHIP_ID	0xA804			/* 43012 chipcommon chipid */
506
+#define	BCM43014_CHIP_ID	0xA806			/* 43014 chipcommon chipid */
507
+#define	BCM4369_CHIP_ID		0x4369			/* 4369 chipcommon chipid */
508
+
406509 #define BCM4350_CHIP(chipid)	((CHIPID(chipid) == BCM4350_CHIP_ID) || \
407510 				(CHIPID(chipid) == BCM4354_CHIP_ID) || \
408
-				(CHIPID(chipid) == BCM4356_CHIP_ID) || \
409511 				(CHIPID(chipid) == BCM43556_CHIP_ID) || \
410512 				(CHIPID(chipid) == BCM43558_CHIP_ID) || \
411513 				(CHIPID(chipid) == BCM43566_CHIP_ID) || \
....@@ -414,11 +516,25 @@
414516 				(CHIPID(chipid) == BCM43569_CHIP_ID) || \
415517 				(CHIPID(chipid) == BCM43570_CHIP_ID) || \
416518 				(CHIPID(chipid) == BCM4358_CHIP_ID)) /* 4350 variations */
519
+
417520 #define BCM4345_CHIP_ID		0x4345		/* 4345 chipcommon chipid */
418521 #define BCM43454_CHIP_ID	43454		/* 43454 chipcommon chipid */
419
-#define BCM43455_CHIP_ID    43455       /* 43455 chipcommon chipid */
420
-#define BCM43457_CHIP_ID    43457       /* 43457 chipcommon chipid */
421
-#define BCM43458_CHIP_ID    43458       /* 43458 chipcommon chipid */
522
+#define BCM43455_CHIP_ID	43455		/* 43455 chipcommon chipid */
523
+#define BCM43457_CHIP_ID	43457		/* 43457 chipcommon chipid */
524
+#define BCM43458_CHIP_ID	43458		/* 43458 chipcommon chipid */
525
+
526
+#define BCM4345_CHIP(chipid)	(CHIPID(chipid) == BCM4345_CHIP_ID || \
527
+				 CHIPID(chipid) == BCM43454_CHIP_ID || \
528
+				 CHIPID(chipid) == BCM43455_CHIP_ID || \
529
+				 CHIPID(chipid) == BCM43457_CHIP_ID || \
530
+				 CHIPID(chipid) == BCM43458_CHIP_ID)
531
+
532
+#define CASE_BCM4345_CHIP	case BCM4345_CHIP_ID: /* fallthrough */ \
533
+				case BCM43454_CHIP_ID: /* fallthrough */ \
534
+				case BCM43455_CHIP_ID: /* fallthrough */ \
535
+				case BCM43457_CHIP_ID: /* fallthrough */ \
536
+				case BCM43458_CHIP_ID
537
+
422538 #define BCM43430_CHIP_ID	43430		/* 43430 chipcommon chipid */
423539 #define BCM43018_CHIP_ID	43018		/* 43018 chipcommon chipid */
424540 #define BCM4349_CHIP_ID		0x4349		/* 4349 chipcommon chipid */
....@@ -428,26 +544,83 @@
428544 				(CHIPID(chipid) == BCM4355_CHIP_ID) || \
429545 				(CHIPID(chipid) == BCM4359_CHIP_ID))
430546 
431
-#define BCM4345_CHIP(chipid)    (CHIPID(chipid) == BCM4345_CHIP_ID || \
432
-				CHIPID(chipid) == BCM43454_CHIP_ID || \
433
-				CHIPID(chipid) == BCM43455_CHIP_ID || \
434
-				CHIPID(chipid) == BCM43457_CHIP_ID || \
435
-				CHIPID(chipid) == BCM43458_CHIP_ID)
436
-
437
-#define CASE_BCM4345_CHIP   case BCM4345_CHIP_ID: /* fallthrough */ \
438
-				case BCM43454_CHIP_ID: /* fallthrough */ \
439
-				case BCM43455_CHIP_ID: /* fallthrough */ \
440
-				case BCM43457_CHIP_ID: /* fallthrough */ \
441
-				case BCM43458_CHIP_ID
547
+#define BCM4355_CHIP(chipid)	(CHIPID(chipid) == BCM4355_CHIP_ID)
442548 
443549 #define BCM4349_CHIP_GRPID		BCM4349_CHIP_ID: \
444550 					case BCM4355_CHIP_ID: \
445551 					case BCM4359_CHIP_ID
552
+#define BCM43596_CHIP_ID		43596		/* 43596 chipcommon chipid */
553
+
554
+#ifdef CHIPS_CUSTOMER_HW6
555
+#define BCM4368_CHIP_ID		0x4368		/* 4368 chipcommon chipid */
556
+#define BCM4368_CHIP(chipid)	(CHIPID(chipid) == BCM4368_CHIP_ID)
557
+#define BCM4368_CHIP_GRPID		BCM4367_CHIP_ID: \
558
+					case BCM4368_CHIP_ID
559
+#endif /* CHIPS_CUSTOMER_HW6 */
560
+
561
+#define BCM4347_CHIP_ID		0x4347          /* 4347 chipcommon chipid */
562
+#define BCM4357_CHIP_ID		0x4357          /* 4357 chipcommon chipid */
563
+#define BCM4361_CHIP_ID		0x4361          /* 4361 chipcommon chipid */
564
+#define BCM4369_CHIP_ID		0x4369          /* 4369/ chipcommon chipid */
565
+#define BCM4373_CHIP_ID		0x4373          /* 4373/ chipcommon chipid */
566
+#define BCM4375_CHIP_ID		0x4375          /* 4375/ chipcommon chipid */
567
+#define BCM4377_CHIP_ID		0x4377          /* 4377/ chipcommon chipid */
568
+#define BCM4362_CHIP_ID		0x4362          /* 4362 chipcommon chipid */
569
+#define BCM43751_CHIP_ID	0xAAE7          /* 43751 chipcommon chipid */
570
+#ifdef CHIPS_CUSTOMER_HW6
571
+#define BCM4369_CHIP_ID		0x4369          /* 4369/ chipcommon chipid */
572
+#define BCM4375_CHIP_ID		0x4375          /* 4375/ chipcommon chipid */
573
+#define BCM4376_CHIP_ID		0x4376          /* 4376 chipcommon chipid */
574
+#define BCM4377_CHIP_ID		0x4377          /* 4377/ chipcommon chipid */
575
+#define BCM4378_CHIP_ID		0x4378          /* 4378 chipcommon chipid */
576
+#define BCM4387_CHIP_ID		0x4387          /* 4387 chipcommon chipid */
577
+#endif /* CHIPS_CUSTOMER_HW6 */
578
+
579
+#define CYW55500_CHIP_ID	0xD8CC		/* CYW55500 chipcommon chipid */
580
+#define CYW55560_CHIP_ID	0xD908		/* CYW55560 chipcommon chipid */
581
+
582
+#define BCM4347_CHIP(chipid)	((CHIPID(chipid) == BCM4347_CHIP_ID) || \
583
+				(CHIPID(chipid) == BCM4357_CHIP_ID) || \
584
+				(CHIPID(chipid) == BCM4361_CHIP_ID))
585
+#define BCM4347_CHIP_GRPID		BCM4347_CHIP_ID: \
586
+					case BCM4357_CHIP_ID: \
587
+					case BCM4361_CHIP_ID
588
+
589
+#define BCM4369_CHIP(chipid)	((CHIPID(chipid) == BCM4369_CHIP_ID) || \
590
+				(CHIPID(chipid) == BCM4377_CHIP_ID))
591
+#define BCM4369_CHIP_GRPID		BCM4369_CHIP_ID: \
592
+					case BCM4377_CHIP_ID
593
+
594
+#define BCM4362_CHIP(chipid)	(CHIPID(chipid) == BCM4362_CHIP_ID)
595
+#define BCM4362_CHIP_GRPID	BCM4362_CHIP_ID
596
+
597
+#ifdef CHIPS_CUSTOMER_HW6
598
+#define BCM4378_CHIP(chipid)    ((CHIPID(chipid) == BCM4378_CHIP_ID) || \
599
+					(CHIPID(chipid) == BCM4376_CHIP_ID))
600
+#define BCM4378_CHIP_GRPID	BCM4378_CHIP_ID: \
601
+					case BCM4376_CHIP_ID
602
+
603
+/* BCM4367 */
604
+#define BCM4367_CHIP_ID		0x4367		/* 4367 chipcommon chipid */
605
+#define CASE_BCM4367_CHIP		case BCM4367_CHIP_ID
606
+#define BCM4367_CHIP(chipid)	(CHIPID(chipid) == BCM4367_CHIP_ID)
607
+
608
+#define BCM4387_CHIP(chipid)	(CHIPID(chipid) == BCM4387_CHIP_ID)
609
+#define BCM4387_CHIP_GRPID	BCM4387_CHIP_ID
610
+#endif /* CHIPS_CUSTOMER_HW6 */
446611 
447612 #define BCM4365_CHIP_ID		0x4365		/* 4365 chipcommon chipid */
448613 #define BCM4366_CHIP_ID		0x4366		/* 4366 chipcommon chipid */
449
-
450
-#define BCM43909_CHIP_ID	0xab85		/* 43909 chipcommon chipid */
614
+#define BCM43664_CHIP_ID	43664		/* 4366E chipcommon chipid */
615
+#define BCM43666_CHIP_ID	43666		/* 4365E chipcommon chipid */
616
+#define BCM4365_CHIP(chipid)	((CHIPID(chipid) == BCM4365_CHIP_ID) || \
617
+				(CHIPID(chipid) == BCM4366_CHIP_ID) || \
618
+				(CHIPID(chipid) == BCM43664_CHIP_ID) || \
619
+				(CHIPID(chipid) == BCM43666_CHIP_ID))
620
+#define CASE_BCM4365_CHIP	case BCM4365_CHIP_ID: /* fallthrough */ \
621
+				case BCM4366_CHIP_ID: /* fallthrough */ \
622
+				case BCM43664_CHIP_ID: /* fallthrough */ \
623
+				case BCM43666_CHIP_ID
451624 
452625 #define BCM43602_CHIP_ID	0xaa52		/* 43602 chipcommon chipid */
453626 #define BCM43462_CHIP_ID	0xa9c6		/* 43462 chipcommon chipid */
....@@ -455,14 +628,13 @@
455628 #define BCM43602_CHIP(chipid)	((CHIPID(chipid) == BCM43602_CHIP_ID) || \
456629 				(CHIPID(chipid) == BCM43462_CHIP_ID) || \
457630 				(CHIPID(chipid) == BCM43522_CHIP_ID)) /* 43602 variations */
631
+#define BCM43012_CHIP(chipid)	(CHIPID(chipid) == BCM43012_CHIP_ID)
458632 #define CASE_BCM43602_CHIP		case BCM43602_CHIP_ID: /* fallthrough */ \
459633 				case BCM43462_CHIP_ID: /* fallthrough */ \
460634 				case BCM43522_CHIP_ID
461635 
462
-#define	BCM4342_CHIP_ID		4342		/* 4342 chipcommon chipid (OTP, RBBU) */
463636 #define	BCM4402_CHIP_ID		0x4402		/* 4402 chipid */
464637 #define	BCM4704_CHIP_ID		0x4704		/* 4704 chipcommon chipid */
465
-#define	BCM4706_CHIP_ID		0x5300		/* 4706 chipcommon chipid */
466638 #define BCM4707_CHIP_ID		53010		/* 4707 chipcommon chipid */
467639 #define BCM47094_CHIP_ID	53030		/* 47094 chipcommon chipid */
468640 #define BCM53018_CHIP_ID	53018		/* 53018 chipcommon chipid */
....@@ -470,26 +642,32 @@
470642 				((chipid) == BCM53018_CHIP_ID) || \
471643 				((chipid) == BCM47094_CHIP_ID))
472644 #define	BCM4710_CHIP_ID		0x4710		/* 4710 chipid */
473
-#define	BCM4712_CHIP_ID		0x4712		/* 4712 chipcommon chipid */
474
-#define	BCM4716_CHIP_ID		0x4716		/* 4716 chipcommon chipid */
475
-#define	BCM47162_CHIP_ID	47162		/* 47162 chipcommon chipid */
476
-#define	BCM4748_CHIP_ID		0x4748		/* 4716 chipcommon chipid (OTP, RBBU) */
477
-#define	BCM4749_CHIP_ID		0x4749		/* 5357 chipcommon chipid (OTP, RBBU) */
478645 #define BCM4785_CHIP_ID		0x4785		/* 4785 chipcommon chipid */
479646 #define	BCM5350_CHIP_ID		0x5350		/* 5350 chipcommon chipid */
480647 #define	BCM5352_CHIP_ID		0x5352		/* 5352 chipcommon chipid */
481
-#define	BCM5354_CHIP_ID		0x5354		/* 5354 chipcommon chipid */
482648 #define BCM5365_CHIP_ID		0x5365		/* 5365 chipcommon chipid */
483
-#define	BCM5356_CHIP_ID		0x5356		/* 5356 chipcommon chipid */
484
-#define	BCM5357_CHIP_ID		0x5357		/* 5357 chipcommon chipid */
485
-#define	BCM53572_CHIP_ID	53572		/* 53572 chipcommon chipid */
486649 #define	BCM53573_CHIP_ID	53573		/* 53573 chipcommon chipid */
487
-#define BCM53573_CHIP(chipid)	(CHIPID(chipid) == BCM53573_CHIP_ID)
488
-#define BCM53573_CHIP_GRPID	BCM53573_CHIP_ID
489
-#define	BCM43012_CHIP_ID	0xA804		/* 43012 chipcommon chipid */
490
-#define BCM4373_CHIP_ID		0x4373		/* 4373 chipcommon chipid */
650
+#define	BCM53574_CHIP_ID	53574		/* 53574 chipcommon chipid */
651
+#define BCM53573_CHIP(chipid)	((CHIPID(chipid) == BCM53573_CHIP_ID) || \
652
+				(CHIPID(chipid) == BCM53574_CHIP_ID) || \
653
+				(CHIPID(chipid) == BCM47452_CHIP_ID))
654
+#define BCM53573_CHIP_GRPID	BCM53573_CHIP_ID : \
655
+				case BCM53574_CHIP_ID : \
656
+				case BCM47452_CHIP_ID
657
+#define BCM53573_DEVICE(devid)	(((devid) == BCM53573_D11AC_ID) || \
658
+				((devid) == BCM53573_D11AC2G_ID) || \
659
+				((devid) == BCM53573_D11AC5G_ID) || \
660
+				((devid) == BCM47189_D11AC_ID) || \
661
+				((devid) == BCM47189_D11AC2G_ID) || \
662
+				((devid) == BCM47189_D11AC5G_ID))
663
+
664
+#define	BCM7271_CHIP_ID		0x05c9		/* 7271 chipcommon chipid */
665
+#define BCM7271_CHIP(chipid)	((CHIPID(chipid) == BCM7271_CHIP_ID))
666
+
667
+#define	BCM4373_CHIP_ID		0x4373		/* 4373 chipcommon chipid */
491668 
492669 /* Package IDs */
670
+#ifdef DEPRECATED /* These products have been deprecated */
493671 #define	BCM4303_PKG_ID		2		/* 4303 package id */
494672 #define	BCM4309_PKG_ID		1		/* 4309 package id */
495673 #define	BCM4712LARGE_PKG_ID	0		/* 340pin 4712 package id */
....@@ -505,37 +683,16 @@
505683 #define	BCM4716_PKG_ID		8		/* 4716 package id */
506684 #define	BCM4717_PKG_ID		9		/* 4717 package id */
507685 #define	BCM4718_PKG_ID		10		/* 4718 package id */
508
-#define BCM5356_PKG_NONMODE	1		/* 5356 package without nmode suppport */
509
-#define BCM5358U_PKG_ID		8		/* 5358U package id */
510
-#define BCM5358_PKG_ID		9		/* 5358 package id */
511
-#define BCM47186_PKG_ID		10		/* 47186 package id */
512
-#define BCM5357_PKG_ID		11		/* 5357 package id */
513
-#define BCM5356U_PKG_ID		12		/* 5356U package id */
514
-#define BCM53572_PKG_ID		8		/* 53572 package id */
515
-#define BCM5357C0_PKG_ID	8		/* 5357c0 package id (the same as 53572) */
516
-#define BCM47188_PKG_ID		9		/* 47188 package id */
517
-#define BCM5358C0_PKG_ID	0xa		/* 5358c0 package id */
518
-#define BCM5356C0_PKG_ID	0xb		/* 5356c0 package id */
519686 #define BCM4331TT_PKG_ID        8		/* 4331 12x12 package id */
520687 #define BCM4331TN_PKG_ID        9		/* 4331 12x9 package id */
521688 #define BCM4331TNA0_PKG_ID     0xb		/* 4331 12x9 package id */
689
+#endif  /* DEPRECATED */
522690 #define BCM47189_PKG_ID		1		/* 47189 package id */
523691 #define BCM53573_PKG_ID		0		/* 53573 package id */
524
-#define	BCM4706L_PKG_ID		1		/* 4706L package id */
525692 
526693 #define HDLSIM5350_PKG_ID	1		/* HDL simulator package id for a 5350 */
527694 #define HDLSIM_PKG_ID		14		/* HDL simulator package id */
528695 #define HWSIM_PKG_ID		15		/* Hardware simulator package id */
529
-#define BCM43224_FAB_CSM	0x8		/* the chip is manufactured by CSM */
530
-#define BCM43224_FAB_SMIC	0xa		/* the chip is manufactured by SMIC */
531
-#define BCM4336_WLBGA_PKG_ID	0x8
532
-#define BCM4330_WLBGA_PKG_ID	0x0
533
-#define BCM4314PCIE_ARM_PKG_ID		(8 | 0)	/* 4314 QFN PCI package id, bit 3 tie high */
534
-#define BCM4314SDIO_PKG_ID		(8 | 1)	/* 4314 QFN SDIO package id */
535
-#define BCM4314PCIE_PKG_ID		(8 | 2)	/* 4314 QFN PCI (ARM-less) package id */
536
-#define BCM4314SDIO_ARM_PKG_ID		(8 | 3)	/* 4314 QFN SDIO (ARM-less) package id */
537
-#define BCM4314SDIO_FPBGA_PKG_ID	(8 | 4)	/* 4314 FpBGA SDIO package id */
538
-#define BCM4314DEV_PKG_ID		(8 | 6)	/* 4314 Developement package id */
539696 
540697 #define BCM4707_PKG_ID		1		/* 4707 package id */
541698 #define BCM4708_PKG_ID		2		/* 4708 package id */
....@@ -555,7 +712,7 @@
555712 #define	BFL_BTC2WIRE		0x00000001  /* old 2wire Bluetooth coexistence, OBSOLETE */
556713 #define BFL_BTCOEX      0x00000001      /* Board supports BTCOEX */
557714 #define	BFL_PACTRL		0x00000002  /* Board has gpio 9 controlling the PA */
558
-#define BFL_AIRLINEMODE	0x00000004  /* Board implements gpio 13 radio disable indication, UNUSED */
715
+#define BFL_AIRLINEMODE	0x00000004  /* Board implements gpio radio disable indication */
559716 #define	BFL_ADCDIV		0x00000008  /* Board has the rssi ADC divider */
560717 #define BFL_DIS_256QAM		0x00000008
561718 #define	BFL_ENETROBO		0x00000010  /* Board has robo switch or core */
....@@ -601,6 +758,7 @@
601758 #define BFL2_5G_PWRGAIN		0x00000010  /* Board supports 5G band power gain */
602759 #define BFL2_PCIEWAR_OVR	0x00000020  /* Board overrides ASPM and Clkreq settings */
603760 #define BFL2_CAESERS_BRD	0x00000040  /* Board is Caesers brd (unused by sw) */
761
+#define BFL2_WLCX_ATLAS		0x00000040  /* Board flag to initialize ECI for WLCX on FL-ATLAS */
604762 #define BFL2_BTC3WIRE		0x00000080  /* Board support legacy 3 wire or 4 wire */
605763 #define BFL2_BTCLEGACY          0x00000080  /* Board support legacy 3/4 wire, to replace
606764 					     * BFL2_BTC3WIRE
....@@ -635,10 +793,6 @@
635793 #define BFL2_PWR_NOMINAL	0x04000000  /* 0: power reduction on, 1: no power reduction */
636794 #define BFL2_EXTLNA_PWRSAVE	0x08000000  /* boardflag to enable ucode to apply power save */
637795 						/* ucode control of eLNA during Tx */
638
-#define BFL2_4313_RADIOREG	0x10000000
639
-									   /*  board rework */
640
-#define BFL2_DYNAMIC_VMID	0x10000000  /* enable dynamic Vmid in idle TSSI CAL for 4331 */
641
-
642796 #define BFL2_SDR_EN		0x20000000  /* SDR enabled or disabled */
643797 #define BFL2_DYNAMIC_VMID	0x10000000  /* boardflag to enable dynamic Vmid idle TSSI CAL */
644798 #define BFL2_LNA1BYPFORTR2G	0x40000000  /* acphy, enable lna1 bypass for clip gain, 2g */
....@@ -707,9 +861,41 @@
707861 #define BFL3_AVVMID_FROM_NVRAM_SHIFT   30   /* Read Av Vmid from NVRAM  */
708862 #define BFL3_VLIN_EN_FROM_NVRAM_SHIFT   31   /* Enable Vlin  from NVRAM  */
709863 
710
-/* boardflags4 for SROM12 */
864
+/* boardflags4 for SROM12/SROM13 */
711865 #define BFL4_SROM12_4dBPAD      (1 << 0)   /* To distinguigh between normal and 4dB pad board */
866
+#define BFL4_SROM12_2G_DETTYPE      (1 << 1)   /* Determine power detector type for 2G */
867
+#define BFL4_SROM12_5G_DETTYPE      (1 << 2)   /* Determine power detector type for 5G */
868
+#define BFL4_SROM13_DETTYPE_EN      (1 << 3)   /* using pa_dettype from SROM13 flags */
869
+#define BFL4_SROM13_CCK_SPUR_EN     (1 << 4)   /* using cck spur reduction setting in 4366 */
870
+#define BFL4_SROM13_1P5V_CBUCK		(1 << 7)   /* using 1.5V cbuck board in 4366 */
871
+#define BFL4_SROM13_EN_SW_TXRXCHAIN_MASK (1 << 8)   /* Enable/disable bit for sw chain mask */
712872 
873
+#define BFL4_4364_HARPOON 0x0100   /* Harpoon module 4364 */
874
+#define BFL4_4364_GODZILLA 0x0200   /* Godzilla module 4364 */
875
+#define BFL4_BTCOEX_OVER_SECI	0x00000400 /* Enable btcoex over gci seci */
876
+
877
+/* papd params */
878
+#define PAPD_TX_ATTN_2G 0xFF
879
+#define PAPD_TX_ATTN_5G 0xFF00
880
+#define PAPD_TX_ATTN_5G_SHIFT 8
881
+#define PAPD_RX_ATTN_2G 0xFF
882
+#define PAPD_RX_ATTN_5G 0xFF00
883
+#define PAPD_RX_ATTN_5G_SHIFT 8
884
+#define PAPD_CAL_IDX_2G 0xFF
885
+#define PAPD_CAL_IDX_5G 0xFF00
886
+#define PAPD_CAL_IDX_5G_SHIFT 8
887
+#define PAPD_BBMULT_2G 0xFF
888
+#define PAPD_BBMULT_5G 0xFF00
889
+#define PAPD_BBMULT_5G_SHIFT 8
890
+#define TIA_GAIN_MODE_2G 0xFF
891
+#define TIA_GAIN_MODE_5G 0xFF00
892
+#define TIA_GAIN_MODE_5G_SHIFT 8
893
+#define PAPD_EPS_OFFSET_2G 0xFFFF
894
+#define PAPD_EPS_OFFSET_5G 0xFFFF0000
895
+#define PAPD_EPS_OFFSET_5G_SHIFT 16
896
+#define PAPD_CALREF_DB_2G 0xFF
897
+#define PAPD_CALREF_DB_5G 0xFF00
898
+#define PAPD_CALREF_DB_5G_SHIFT 8
713899 
714900 /* board specific GPIO assignment, gpio 0-3 are also customer-configurable led */
715901 #define	BOARD_GPIO_BTC3W_IN	0x850	/* bit 4 is RF_ACTIVE, bit 6 is STATUS, bit 11 is PRI */
....@@ -732,12 +918,6 @@
732918 #define	BOARD_GPIO_13_WLAN_PWR	0x2000	/* throttle WLAN power on X14 board */
733919 
734920 #define GPIO_BTC4W_OUT_4312  0x010  /* bit 4 is BT_IODISABLE */
735
-#define GPIO_BTC4W_OUT_43224  0x020  /* bit 5 is BT_IODISABLE */
736
-#define GPIO_BTC4W_OUT_43224_SHARED  0x0e0  /* bit 5 is BT_IODISABLE */
737
-#define GPIO_BTC4W_OUT_43225  0x0e0  /* bit 5 BT_IODISABLE, bit 6 SW_BT, bit 7 SW_WL */
738
-#define GPIO_BTC4W_OUT_43421  0x020  /* bit 5 is BT_IODISABLE */
739
-#define GPIO_BTC4W_OUT_4313  0x060  /* bit 5 SW_BT, bit 6 SW_WL */
740
-#define GPIO_BTC4W_OUT_4331_SHARED  0x010  /* GPIO 4  */
741921 
742922 #define	PCI_CFG_GPIO_SCS	0x10	/* PCI config space bit 4 for 4306c0 slow clock source */
743923 #define PCI_CFG_GPIO_HWRAD	0x20	/* PCI config space GPIO 13 for hw radio disable */
....@@ -750,20 +930,25 @@
750930 #define MIN_SLOW_CLK		32		/* us Slow clock period */
751931 #define	XTAL_ON_DELAY		1000		/* us crystal power-on delay */
752932 
933
+/* 43012 wlbga Board */
934
+#define BCM943012WLREF_SSID	0x07d7
753935 
754
-/* 43341 Boards */
755
-#define BCM943341WLABGS_SSID	0x062d
756
-
757
-/* 43342 Boards */
758
-#define BCM943342FCAGBI_SSID	0x0641
936
+/* 43012 fcbga Board */
937
+#define BCM943012FCREF_SSID	0x07d4
759938 
760939 /* 43602 Boards, unclear yet what boards will be created. */
761940 #define BCM943602RSVD1_SSID	0x06a5
762941 #define BCM943602RSVD2_SSID	0x06a6
763942 #define BCM943602X87            0X0133
764
-#define BCM943602X87P2          0X0143
943
+#define BCM943602X87P2          0X0152
944
+#define BCM943602X87P3          0X0153
765945 #define BCM943602X238           0X0132
766946 #define BCM943602X238D          0X014A
947
+#define BCM943602X238DP2        0X0155
948
+#define BCM943602X238DP3        0X0156
949
+#define BCM943602X100           0x0761
950
+#define BCM943602X100GS         0x0157
951
+#define BCM943602X100P2         0x015A
767952 
768953 /* # of GPIO pins */
769954 #define GPIO_NUMPINS		32
....@@ -781,8 +966,6 @@
781966 #define RDL_RAM_BASE_4322 0x60000000
782967 #define RDL_RAM_SIZE_4360  0xA0000
783968 #define RDL_RAM_BASE_4360  0x60000000
784
-#define RDL_RAM_SIZE_43242  0x90000
785
-#define RDL_RAM_BASE_43242  0x60000000
786969 #define RDL_RAM_SIZE_43143  0x70000
787970 #define RDL_RAM_BASE_43143  0x60000000
788971 #define RDL_RAM_SIZE_4350  0xC0000