summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-02-14 16:25:27 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-02-14 16:25:27 +0000
commit70b3947baf9845fd56aac0b287f30c67f154d8e6 (patch)
tree95d0bcd3e1f866ee4c012239823ad8eaa2301670
parent54b24e7195bb914ceebff982f37dade177c94d30 (diff)
parentd9e25c455e25c215abbb7c61a4e3b191d68a629e (diff)
downloadtaimen-pie-qpr2-release.tar.gz
Merge cherrypicks of [6391991, 6392011, 6391992, 6391993, 6392031, 6392051, 6392052, 6392091, 6392111, 6392032, 6391994, 6391995, 6391996, 6391997, 6391998, 6391999, 6392000, 6392001, 6392002, 6392003, 6392004, 6392005, 6392006, 6392112, 6392113, 6392151, 6392152] into pi-qpr2-releaseandroid-9.0.0_r35pie-qpr2-release
Change-Id: I7837a45b32b1cb9d4c9eb0d566475aac031d2838
-rw-r--r--nfc/libnfc-nxp.taimen.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/nfc/libnfc-nxp.taimen.conf b/nfc/libnfc-nxp.taimen.conf
index 1411ac8..c239f82 100644
--- a/nfc/libnfc-nxp.taimen.conf
+++ b/nfc/libnfc-nxp.taimen.conf
@@ -246,7 +246,7 @@ NXP_I2C_FRAGMENTATION_ENABLED=0x00
###############################################################################
# Core configuration settings
-NXP_CORE_CONF={ 20, 02, 31, 0F,
+NXP_CORE_CONF={ 20, 02, 2D, 0F,
85, 01, 01,
28, 01, 00,
21, 01, 00,
@@ -254,7 +254,7 @@ NXP_CORE_CONF={ 20, 02, 31, 0F,
31, 01, 03,
32, 01, 60,
38, 01, 01,
- 33, 04, 01, 02, 03, 04,
+ 33, 00,
54, 01, 06,
50, 01, 02,
5B, 01, 00,