1 files changed, 30 insertions, 10 deletions

diff --git a/drivers/net/wireless/ti/wl12xx/wl12xx.h b/drivers/net/wireless/ti/wl12xx/wl12xx.h
index 7182bbf6625d..d4552857480c 100644
--- a/drivers/net/wireless/ti/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/ti/wl12xx/wl12xx.h
@@ -24,19 +24,37 @@
 
 #include "conf.h"
 
-/* minimum FW required for driver for wl127x */
+/* WiLink 6/7 chip IDs */
+#define CHIP_ID_127X_PG10              (0x04030101)
+#define CHIP_ID_127X_PG20              (0x04030111)
+#define CHIP_ID_128X_PG10              (0x05030101)
+#define CHIP_ID_128X_PG20              (0x05030111)
+
+/* FW chip version for wl127x */
 #define WL127X_CHIP_VER         6
-#define WL127X_IFTYPE_VER       3
-#define WL127X_MAJOR_VER        10
-#define WL127X_SUBTYPE_VER      2
-#define WL127X_MINOR_VER        115
+/* minimum single-role FW version for wl127x */
+#define WL127X_IFTYPE_SR_VER    3
+#define WL127X_MAJOR_SR_VER     10
+#define WL127X_SUBTYPE_SR_VER   WLCORE_FW_VER_IGNORE
+#define WL127X_MINOR_SR_VER     115
+/* minimum multi-role FW version for wl127x */
+#define WL127X_IFTYPE_MR_VER    5
+#define WL127X_MAJOR_MR_VER     7
+#define WL127X_SUBTYPE_MR_VER   WLCORE_FW_VER_IGNORE
+#define WL127X_MINOR_MR_VER     115
 
-/* minimum FW required for driver for wl128x */
+/* FW chip version for wl128x */
 #define WL128X_CHIP_VER         7
-#define WL128X_IFTYPE_VER       3
-#define WL128X_MAJOR_VER        10
-#define WL128X_SUBTYPE_VER      2
-#define WL128X_MINOR_VER        115
+/* minimum single-role FW version for wl128x */
+#define WL128X_IFTYPE_SR_VER    3
+#define WL128X_MAJOR_SR_VER     10
+#define WL128X_SUBTYPE_SR_VER   WLCORE_FW_VER_IGNORE
+#define WL128X_MINOR_SR_VER     115
+/* minimum multi-role FW version for wl128x */
+#define WL128X_IFTYPE_MR_VER    5
+#define WL128X_MAJOR_MR_VER     7
+#define WL128X_SUBTYPE_MR_VER   WLCORE_FW_VER_IGNORE
+#define WL128X_MINOR_MR_VER     42
 
 #define WL12XX_AGGR_BUFFER_SIZE (4 * PAGE_SIZE)
 
@@ -55,6 +73,8 @@ struct wl12xx_priv {
 
         int ref_clock;
         int tcxo_clock;
+
+        struct wl127x_rx_mem_pool_addr *rx_mem_addr;
 };
 
 #endif /* __WL12XX_PRIV_H__ */