summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--device.mk3
-rw-r--r--nfc/libnfc-nxp.conf4
2 files changed, 4 insertions, 3 deletions
diff --git a/device.mk b/device.mk
index 35cd9e00..3fe95873 100644
--- a/device.mk
+++ b/device.mk
@@ -290,7 +290,7 @@ PRODUCT_PACKAGES += \
# NFC packages
PRODUCT_PACKAGES += \
- nfc_nci.$(PRODUCT_HARDWARE) \
+ nfc_nci.$(TARGET_BOARD_PLATFORM) \
NfcNci \
Tag \
android.hardware.nfc@1.0-impl \
@@ -298,6 +298,7 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
device/google/crosshatch/nfc/libnfc-brcm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-brcm.conf \
+ device/google/crosshatch/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf \
PRODUCT_PACKAGES += \
android.hardware.usb@1.1-service.crosshatch
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
index 571d7eb5..57e31bd0 100644
--- a/nfc/libnfc-nxp.conf
+++ b/nfc/libnfc-nxp.conf
@@ -35,7 +35,7 @@ VZW_FEATURE_ENABLE=0x01
# System clock source selection configuration
#define CLK_SRC_XTAL 1
#define CLK_SRC_PLL 2
-NXP_SYS_CLK_SRC_SEL=0x02
+NXP_SYS_CLK_SRC_SEL=0x01
###############################################################################
# System clock frequency selection configuration
@@ -45,7 +45,7 @@ NXP_SYS_CLK_SRC_SEL=0x02
#define CLK_FREQ_26MHZ 4
#define CLK_FREQ_38_4MHZ 5
#define CLK_FREQ_52MHZ 6
-NXP_SYS_CLK_FREQ_SEL=0x02
+NXP_SYS_CLK_FREQ_SEL=0x00
###############################################################################
# The timeout value to be used for clock request acknowledgment