aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Riordan <jriordan001@gmail.com>2016-06-29 22:55:12 -0400
committerNyks45 <winglow45@gmail.com>2016-10-12 17:38:06 +0200
commit074ba4998f1e68bc70715bcc018c1a002ede4377 (patch)
tree4d60033164890e7b397d3dd3e0032bbd7402feb4
parent3fbdbb3f4a39fb1d11850671fcee57f010f33e9b (diff)
Z00A: NFC blobs and configs update from M beta
Change-Id: I10285c68cb5b57a1d3d1de23a9e370f5c982158d
-rw-r--r--device.mk6
-rw-r--r--nfc/libnfc-brcm-20795a20.conf1
-rw-r--r--nfc/libnfc-brcm.conf9
-rw-r--r--proprietary-files.txt1
4 files changed, 16 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 9969dd4..514ca6d 100644
--- a/device.mk
+++ b/device.mk
@@ -38,6 +38,12 @@ PRODUCT_COPY_FILES += \
device/asus/Z00A/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
device/asus/Z00A/nfc/libnfc-brcm-20795a20.conf:system/etc/libnfc-brcm-20795a20.conf
+ADDITIONAL_DEFAULT_PROPERTIES += \
+ sys.nfc.project_id_str=ze551ml \
+ sys.nfc.loc=gold \
+ sys.nfc.brcm.cfg=/etc/libnfc-brcm.conf \
+ sys.nfc.brcm.chip_cfg=/etc/libnfc-brcm-20795a20.conf
+
# NFC packages
PRODUCT_PACKAGES += \
nfc_nci.bcm2079x.default \
diff --git a/nfc/libnfc-brcm-20795a20.conf b/nfc/libnfc-brcm-20795a20.conf
index 2c8207c..2e0bb69 100644
--- a/nfc/libnfc-brcm-20795a20.conf
+++ b/nfc/libnfc-brcm-20795a20.conf
@@ -1,3 +1,4 @@
+# ze551ml_gold_libnfc-brcm-20795a20.conf
###############################################################################
# Firmware patch file
FW_PATCH="/vendor/firmware/bcm2079x-a2_firmware.ncd"
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index b09d945..abe415b 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -1,3 +1,4 @@
+# ze551ml_gold_libnfc-brcm.conf
###################### Start of libnfc-brcm-common.conf #######################
###############################################################################
@@ -92,6 +93,12 @@ POLLING_TECH_MASK=0xEF
TRANSPORT_DRIVER="/dev/bcm2079x-i2c"
###############################################################################
+# For old nfc chip, there's a prefix byte in NCI format.
+# New NFC chip solution will remove it.
+# Just for compatibility.
+TRANSPORT_PREFIX=1
+
+###############################################################################
# power control driver
# Specify a kernel driver that support ioctl commands to control NFC_EN and
# NFC_WAKE gpio signals.
@@ -122,4 +129,4 @@ AID_MATCHING_MODE=2
NFA_DM_LP_CFG={01,61,00,08}
-SCREEN_OFF_POWER_STATE=3 \ No newline at end of file
+SCREEN_OFF_POWER_STATE=3
diff --git a/proprietary-files.txt b/proprietary-files.txt
index cbeb2eb..2d292b5 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -6,6 +6,7 @@ etc/catalog/V1_DSDA/audiocomms_config/parameter-framework/Settings/Route/RouteCo
# Bluetooth
etc/firmware/BCM4335C0_003.001.009.0105.0563_Asus_ZE551ML.hcd
+etc/firmware/BCM4335C0_003.001.009.0105.0610_Asus_ZX551ML.hcd
# Camera
lib/libxditk_DIT_Moorefield.so