peach: rebase device tree

3 files changed, 42 insertions, 138 deletions

diff --git a/wifi/WCNSS_cfg.dat b/wifi/WCNSS_cfg.dat
index 0637816..66d38cc 100644
--- a/wifi/WCNSS_cfg.dat
+++ b/wifi/WCNSS_cfg.dat
diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index e6f91a0..a1b0c64 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -11,10 +11,6 @@ gEnableImps=1
 gEnableIdleScan=0
 
 
-# Enable/Disable vsta based on MAX Assoc limit
-gEnableVSTASupport=1
-
-
 # Increase sleep duration (seconds) during IMPS
 # 0 implies no periodic wake up from IMPS. Periodic wakeup is
 # unnecessary if Idle Scan is disabled.
@@ -28,7 +24,8 @@ gEnableBmps=1
 
 # 1: Enable standby, 2: Enable Deep sleep, 3: Enable Mcast/Bcast Filter
 
-gEnableSuspend=1
+gEnableSuspend=3
+
 
 # Phy Mode (auto, b, g, n, etc)
 # Valid values are 0-9, with 0 = Auto, 4 = 11n, 9 = 11ac
@@ -39,6 +36,8 @@ gDot11Mode=0
 
 gRoamingTime=0
 
+#yulong add for userspace set channel
+gSapAllowAllChannel=1
 
 # Assigned MAC Addresses - This will be used until NV items are in place
 
@@ -85,7 +84,7 @@ gNthBeaconFilter=50
 
 # 2: Filter all Broadcast. 3: Filter all Mcast abd Bcast
 
-McastBcastFilter=0
+McastBcastFilter=3
 
 
 #Flag to enable HostARPOffload feature or not
@@ -93,10 +92,6 @@ McastBcastFilter=0
 hostArpOffload=1
 
 
-#Flag to enable HostNSOffload feature or not
-
-hostNSOffload=0
-
 #SoftAP Related Parameters
 
 # AP MAc addr
@@ -151,46 +146,32 @@ WmmIsEnabled=0
 
 # 802.11d support
 
-g11dSupportEnabled=1
+g11dSupportEnabled=0
 
-# 802.11h support
-
-g11hSupportEnabled=1
-
-# ESE Support and fast transition
-EseEnabled=0
+# CCX Support and fast transition
+CcxEnabled=0
+FastTransitionEnabled=1
 ImplicitQosIsEnabled=0
 gNeighborScanTimerPeriod=200
 
-gNeighborLookupThreshold=76
-gNeighborReassocThreshold=81
+# default value of this parameter is zero to enable dynamic threshold allocation
+# to set static roming threshold uncomment below parameter and set vaule
+#gNeighborLookupThreshold=78
 
 gNeighborScanChannelMinTime=20
 gNeighborScanChannelMaxTime=30
-gMaxNeighborReqTries=3
 
-# Legacy (non-ESE, non-802.11r) Fast Roaming Support
+# Legacy (non-CCX, non-802.11r) Fast Roaming Support
 # To enable, set FastRoamEnabled=1
 # To disable, set FastRoamEnabled=0
 FastRoamEnabled=1
 
 #Check if the AP to which we are roaming is better than current AP in terms of RSSI.
-#Checking is disabled if set to Zero.Otherwise it will use this value as to how better 
+#Checking is disabled if set to Zero.Otherwise it will use this value as to how better
 #the RSSI of the new/roamable AP should be for roaming
-RoamRssiDiff=3
-
-# If the RSSI of any available candidate is better than currently associated
-# AP by at least gImmediateRoamRssiDiff, then being to roam immediately (without
-# registering for reassoc threshold).
-# NOTE: Value of 0 means that we would register for reassoc threshold.
-gImmediateRoamRssiDiff=10
-
-# To enable, set gRoamIntraBand=1 (Roaming within band)
-# To disable, set gRoamIntraBand=0 (Roaming across band)
-
-gRoamIntraBand=0
+RoamRssiDiff=5
 
-#SAP Country code
+# SAP Country code
 
 # Default Country Code is 2 bytes, 3rd byte is optional indoor or out door.
 
@@ -225,7 +206,7 @@ gAPAutoShutOff=0
 
 # 1 = enable auto channel selection, channel provided by supplicant will be ignored
 
-gApAutoChannelSelection=1
+gApAutoChannelSelection=0
 
 
 # Listen Energy Detect Mode Configuration
@@ -277,9 +258,9 @@ BandCapability=0
 
 #Beacon Early Termination (1 = enable the BET feature, 0 = disable)
 
-enableBeaconEarlyTermination=0
+enableBeaconEarlyTermination=1
 
-beaconEarlyTerminationWakeInterval=3
+beaconEarlyTerminationWakeInterval=11
 
 
 #Bluetooth Alternate Mac Phy (1 = enable the BT AMP feature, 0 = disable)
@@ -287,7 +268,7 @@ beaconEarlyTerminationWakeInterval=3
 gEnableBtAmp=0
 
 
-#SOFTAP Channel Range selection 
+#SOFTAP Channel Range selection
 
 gAPChannelSelectStartChannel=1
 
@@ -296,29 +277,33 @@ gAPChannelSelectEndChannel=11
 
 #SOFTAP Channel Range selection Operating band
 
-# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND 5: 5GHZ BAND
+# 0:2.4GHZ 1: LOW-5GHZ 2:MID-5GHZ 3:HIGH-5GHZ 4: 4.9HZ BAND
 
 gAPChannelSelectOperatingBand=0
 
 
 #Channel Bonding
 gChannelBondingMode5GHz=1
-gChannelBondingMode24GHz=1
+
+gEnableModulatedDTIM = 3
+gMaxLIModulatedDTIM = 3
+gEnableDatainactivity = 200
 
 #Enable Keep alive with non-zero period value
 
-#gStaKeepAlivePeriod = 30
+gStaKeepAlivePeriod=30
+
 
 #Say gGoKeepAlivePeriod(5 seconds) and gGoLinkMonitorPeriod(10 seconds).
-#For every 10 seconds DUT send Qos Null frame(i.e., Keep Alive frame if link is idle for last 10 seconds.)
+#For every 10 seconds DUT sends Qos Null frame(i.e., Keep Alive frame if link is idle for last 10 seconds.)
 #For both active and power save clients.
 
 #Power save clients: DUT set TIM bit from 10th second onwards and till client honors TIM bit.
-#If doesn't honor for 5 seconds then DUT remove client.
+#If doesn't honor for 5 seconds then Driver remove client.
 
-#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not success still we try on
+#Active clients: DUT send Qos Null frame for 10th seconds onwards if it is not success still DUT try on
 #11th second if not tries on 12th and so on till 15th second. Hence before disconnection DUT will send 5 NULL frames.
-#Hence in any case DUT will detect client got removed in (10+5) seconds. i.e., (gGoKeepAlivePeriod + gGoLinkMonitorPeriod)..
+#Hence in any case DUT will detect client got removed in (10+5) seconds. i.e., (gGoKeepAlivePeriod +gGoLinkMonitorPeriod)..
 
 #gGoLinkMonitorPeriod/ gApLinkMonitorPeriod is period where link is idle and it is period
 #where we send NULL frame.
@@ -329,32 +314,26 @@ gChannelBondingMode24GHz=1
 
 #gGoKeepAlivePeriod/gApKeepAlivePeriod is time to spend to check whether frame are succeed to send or not.
 #Hence total effective detection time is gGoLinkMonitorPeriod+ gGoKeepAlivePeriod/gApLinkMonitorPeriod+ gApKeepAlivePeriod.
+gGoKeepAlivePeriod = 10
 
-
-gGoKeepAlivePeriod=30
-
-gApKeepAlivePeriod=10
-
-
+gApKeepAlivePeriod = 30
 #If set will start with active scan after driver load, otherwise will start with
 
 #passive scan to find out the domain
 
-gEnableBypass11d=1
+#gEnableBypass11d=1
 
 
 #If set to 0, will not scan DFS channels
 
 gEnableDFSChnlScan=1
 
-
-gVhtChannelWidth=2
 gEnableLogp=1
 
 
 # Enable Automatic Tx Power control
 
-gEnableAutomaticTxPowerControl=0
+gEnableAutomaticTxPowerControl=1
 
 # 0 for OLPC 1 for CLPC and SCPC
 gEnableCloseLoop=1
@@ -362,54 +341,20 @@ gEnableCloseLoop=1
 #Data Inactivity Timeout when in powersave (in ms)
 gDataInactivityTimeout=200
 
-# VHT Tx/Rx MCS values
-# Valid values are 0,1,2. If commented out, the default value is 0.
-# 0=MCS0-7, 1=MCS0-8, 2=MCS0-9
-gVhtRxMCS=2
-gVhtTxMCS=2
-
-# Enable CRDA regulatory support by settings default country code
-#gCrdaDefaultCountryCode=TW
+gEnableLpwrImgTransition=1
 
 # Scan Timing Parameters
 # gPassiveMaxChannelTime=110
 # gPassiveMinChannelTime=60
+# Enable Tx LDPC
+#gTxLdpcEnable = 1 for HT mode, 2 for VHT mode,3 for both HT and VHT
+gTxLdpcEnable=3
 # gActiveMaxChannelTime=40
 # gActiveMinChannelTime=20
 
-#If set to 0, MCC is not allowed.
-gEnableMCCMode=1
-
-# 1=enable STBC; 0=disable STBC 
-gEnableRXSTBC=1
-
-# Enable Active mode offload
-gEnableActiveModeOffload=1
-
-#Enable Scan Results Aging based on timer 
-#Timer value is in seconds
-#If Set to 0 it will not enable the feature
-gScanAgingTime=0
-
-#Enable Power saving mechanism Based on Android Framework
-#If set to 0 Driver internally control the Power saving mechanism
-#If set to 1 Android Framwrok control the Power saving mechanism
-isAndroidPsEn=0
-
-#disable LDPC in STA mode if the AP is TXBF capable
-gDisableLDPCWithTxbfAP=1
-
-#Enable thermal mitigation
-gThermalMitigationEnable=1
-
-gEnableFastRoamInConcurrency=1
-
-#List of Country codes for which 11ac needs to be disabled
-#Each country code must be delimited by comma(,)
-gListOfNon11acCountryCode=RU,UA,ZA
-
-#Maxium Channel time in msec
-gMaxMediumTime = 5480
+# Valid values are 2048,4096,8192 and so on
+# Please don't use values other than the ones mentioned above
+gMaxMediumTime=4096
 
 # 802.11K support
 gRrmEnable=1
@@ -424,47 +369,6 @@ gEnableDirectedScanOffload=0
 #Default is set to 0 (disable)
 gFlexConnectPowerFactor=0
 
-#SAP/P2P-GO mode traffic monitor
-gEnableTrafficMonitor=1
-gTrafficIdleTimeout=3000
-
-#Disable/Enable Strict FCC Regulatory
-# 0 to disable, 1 to enable
-gEnableStrictRegulatoryForFCC=1
-
-#Enable/Disable Modulated DTIM feature
-gEnableModulatedDTIM=3
-
-#max LI value for modulated DTIM
-gMaxLIModulatedDTIM=3
-
-#Enable/Disable Link Layer Statistics Feature
-gEnableLLStats=1
-
-#Enable/Disable EXTScan Feature
-gEnableEXTScan=1
-
-#Enable/Disable TDLS Feature
-gEnableTDLSSupport=1
-
-#Enable/Disable TDLS Implicit Trigger
-gEnableTDLSImplicitTrigger=0
-
-#Enable/Disable TDLS Buffer Sta
-gEnableTDLSBufferSta=1
-
-#Enable/Disable RTS-CTS for HT,VHT
-#Bit mask value to enable RTS/CTS for different modes
-#For 2.4 GHz, HT20 - 0x0001 i.e 1, for 2.4 GHz, HT40 - 0x0002 i.e 2
-#For 2.4 GHz, VHT20 - 0x0004 i.e 4, for 2.4 GHz, VHT40 - 0x0008 i.e 8
-#For 5 GHz, HT20 - 0x0100 i.e 256, for 5 GHz, HT40 - 0x0200 i.e 512
-#For 5 GHz, VHT20 - 0x0400 i.e 1024, for 5 GHz, VHT40 - 0x0800 i.e 2048
-#For 5 GHz, VHT80 - 0x1000 i.e 4096
-#Can be enabled for multiple modes
-#For enabling in both HT20 and HT40 of 2.4 GHz - 0x0003 i.e 3
-#Default is set to 0 (disable)
-gEnableRtsCtsHtVht=0
-
 END
 
 # Note: Configuration parser would not read anything past the END marker
diff --git a/wifi/WCNSS_qcom_wlan_nv.bin b/wifi/WCNSS_qcom_wlan_nv.bin
index 14ce361..88f18cb 100644
--- a/wifi/WCNSS_qcom_wlan_nv.bin
+++ b/wifi/WCNSS_qcom_wlan_nv.bin