diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-25 03:32:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-25 03:32:32 +0000 |
| commit | d95c83403cb2197aeae83ceba5d38ab369549e4f (patch) | |
| tree | 7a2ccdff9f3a9e4fb7608868ce18f563d52ffc7f | |
| parent | 05ecf40aa3ee5543b827462c45e0628eded7f51c (diff) | |
| parent | f7e984cb4a0a973ea6baa16defd66371ac0f19fe (diff) | |
Merge cherrypicks of [2793689, 2793690, 2790745, 2793230, 2792812, 2793231, 2790746, 2790747, 2793232] into oc-dr1-releaseo8.0
Change-Id: I90f37c9338179e50d67c9c5a63b335c99ac30f7d
| -rw-r--r-- | WCNSS_qcom_cfg.ini | 2 | ||||
| -rw-r--r-- | nfc/libnfc-nxp.taimen.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini index 669595f..57d76f2 100644 --- a/WCNSS_qcom_cfg.ini +++ b/WCNSS_qcom_cfg.ini @@ -600,7 +600,7 @@ gEnableTxBFeeSAP=1 # scan policy disabled # 4 - enable DBS for connection as well as for scan with async # scan policy disabled -gDualMacFeatureDisable=2 +gDualMacFeatureDisable=1 #Set priority for connection with bssid_hint g_is_bssid_hint_priority=0 diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf index 1374134..620ba70 100644 --- a/nfc/libnfc-nxp.taimen.conf +++ b/nfc/libnfc-nxp.taimen.conf @@ -83,7 +83,7 @@ NXP_EXT_TVDD_CFG_1={20, 02, 0F, 01, A0, 0E, 0B, 31, 01, 01, 31, 00, 00, 00, 01, ############################################################################### #config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM, #monitoring 5V from DCDC, 3.3V for both RM and CM, DCDCWaitTime=4.2ms -NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, BA, 00, B2, 1E, 15, 00, D0, 0C} +NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, C2, B2, 00, BA, 1E, 15, 00, D0, 0C} ############################################################################### # NXP RF configuration ALM/PLM settings |