diff --git a/BoardConfig.mk b/BoardConfig.mk
index df7caf6..724f826 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -188,6 +188,4 @@ USE_MINIKIN := true
 EXTENDED_FONT_FOOTPRINT := true
 
 # Nfc
-BOARD_NFC_HAL_SUFFIX := w7
 BOARD_NFC_CHIPSET := pn547
-
diff --git a/device_w7.mk b/device_w7.mk
index ea7ce78..fc57e95 100644
--- a/device_w7.mk
+++ b/device_w7.mk
@@ -377,7 +377,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
     NfcNci \
     Tag \
-    nfc_nci.w7 \
+    nfc_nci.pn54x.default \
     com.android.nfc_extras
 
 NFCEE_ACCESS_PATH := device/lge/w7/prebuilt/etc/nfcee_access.xml
diff --git a/prebuilt/etc/libnfc-brcm.conf b/prebuilt/etc/libnfc-brcm.conf
index ce161b0..4df65fc 100644
--- a/prebuilt/etc/libnfc-brcm.conf
+++ b/prebuilt/etc/libnfc-brcm.conf
@@ -135,6 +135,12 @@ OBERTHUR_WARM_RESET_COMMAND=0x03
 # Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
 UICC_LISTEN_TECH_MASK=0xC7
 
+###############################################################################
+# Force HOST listen feature enable or disable.
+# 0: Disable
+# 1: Enable
+HOST_LISTEN_ENABLE=0x01
+
 ###############################################################################
 # Allow UICC to be powered off if there is no traffic.
 # Timeout is in ms. If set to 0, then UICC will not be powered off.
@@ -311,3 +317,13 @@ POLLING_TECH_MASK=0xEF
 P2P_LISTEN_TECH_MASK=0xC4
 
 PRESERVE_STORAGE=0x01
+
+###############################################################################
+# Maximum EE supported number
+# NXP PN547C2 0x02
+# NXP PN65T 0x03
+NFA_MAX_EE_SUPPORTED=0x03
+
+###############################################################################
+# NCI Hal Module name
+NCI_HAL_MODULE="nfc_nci.pn54x"