commit 7da203b409f7801c6dd061909a69b22b56dcbd6e
author android-build-team Robot <android-build-team-robot@google.com> Wed Oct 25 21:04:21 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Oct 25 21:04:21 2017 +0000
tree 1dcef2b34117c91ed632ed93ee284b540bffc22c
parent 2c6694b3eca8838b25c1827431964b074c981f57
parent e1e19f1e336f02a9b4ba48ba7a7711f75c60bd27

Merge cherrypicks of [3120219, 3121602, 3124243, 3125180] into oc-mr1-release

Change-Id: I0e105cd329ee5aa49ff3981aa5cb793dee02ddc7

nfc/libnfc-nxp.muskie.conf

diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf
index 90078e5..973dee6 100644
--- a/nfc/libnfc-nxp.muskie.conf
+++ b/nfc/libnfc-nxp.muskie.conf
@@ -84,7 +84,7 @@
 ###############################################################################
 #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, B2, 00, BA, 1E, 18, 00, D0, 0C}
+NXP_EXT_TVDD_CFG_2={20, 02, 0F, 01, A0, 0E, 0B, 11, 01, 82, B2, 00, BA, 1E, 18, 00, D0, 0C}
 
 ###############################################################################
 # NXP RF configuration ALM/PLM settings