From 5f6f8f724d341f50e603e3767807ce0b37739056 Mon Sep 17 00:00:00 2001
From: "yang.tian" <yang.tian@nxp.com>
Date: Thu, 14 Oct 2021 10:32:45 +0800
Subject: [PATCH] [Android] FwImage: android_wifi_mod_para.conf merge changes
 from BSP conf

FwImage: update firmware to mxm5x17283
FwImage: wifi_mod_para.conf: change the load parameters of wifi
driver to support WPA3 feature

also refine load params to better align with WCS team.

Still keep wfd_name=p2p and max_vir_bss=1 to better support p2p
function.

Also add SD8801 load parameters support.

Signed-off-by: yang.tian <yang.tian@nxp.com>
---
 nxp/android_wifi_mod_para.conf           | 52 ++++++++++++++++--------
 nxp/android_wifi_mod_para_powersave.conf | 10 +++--
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/nxp/android_wifi_mod_para.conf b/nxp/android_wifi_mod_para.conf
index c2d1e0f..cd36419 100644
--- a/nxp/android_wifi_mod_para.conf
+++ b/nxp/android_wifi_mod_para.conf
@@ -34,8 +34,9 @@ SD8997 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=sdiouart8997_combo_v4.bin
 }
 
@@ -43,7 +44,8 @@ SD8997 = {
 #       cfg80211_wext=0xf
 #       wfd_name=wfd0
 #       max_vir_bss=1
-#       cal_data_cfg=nxp/WlanCalData_ext_8997_QFN_TB.conf
+#       cal_data_cfg=nxp
+#       /WlanCalData_ext_8997_QFN_TB.conf
 #       drv_mode=5
 #}
 
@@ -78,8 +80,9 @@ SD8987 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=sdiouart8987_combo_v0.bin
 }
 
@@ -98,8 +101,9 @@ PCIE8997 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=pcieuart8997_combo_v4.bin
 }
 
@@ -110,8 +114,9 @@ PCIE9098_0 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	mac_addr=00:50:43:20:12:34
 	fw_name=pcieuart9098_combo_v1.bin
 }
@@ -123,8 +128,9 @@ PCIE9098_1 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	mac_addr=00:50:43:20:52:56
 	fw_name=pcieuart9098_combo_v1.bin
 }
@@ -136,8 +142,9 @@ SD9098_0 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	mac_addr=00:50:43:20:12:34
 	fw_name=sdiouart9098_combo_v1.bin
 }
@@ -149,8 +156,9 @@ SD9098_1 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	mac_addr=00:50:43:20:52:56
 	fw_name=sdiouart9098_combo_v1.bin
 }
@@ -162,11 +170,21 @@ SD8978 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=sdiouartiw416_combo_v0.bin
 }
 
+SD8801 = {
+	cfg80211_wext=0xf
+	cal_data_cfg=none
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
+	fw_name=nxp/sd8801_uapsta.bin
+}
+
 #USB8997 = {
 #	hw_test=0
 #	fw_name="nxp/usbusb8997_combo_v4.bin"
diff --git a/nxp/android_wifi_mod_para_powersave.conf b/nxp/android_wifi_mod_para_powersave.conf
index 1bd687b..abcaf85 100644
--- a/nxp/android_wifi_mod_para_powersave.conf
+++ b/nxp/android_wifi_mod_para_powersave.conf
@@ -75,8 +75,9 @@ SD8987 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=sdiouart8987_combo_v0.bin
 	powersave_enable=1
 }
@@ -97,8 +98,9 @@ PCIE8997 = {
 	wfd_name=p2p
 	max_vir_bss=1
 	cal_data_cfg=none
-	ps_mode=2
-	auto_ds=2
+	ps_mode=1
+	auto_ds=1
+	host_mlme=1
 	fw_name=pcieuart8997_combo_v4.bin
 	powersave_enable=1
 }