zl1: commonize NFC

* max_plus has NFC (PN548)
* remove NFC if x2 is detected

Change-Id: Iad9f3c9c8521060c56087051a837f0c530763763

12 files changed, 0 insertions, 790 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3311675..12d0429 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -38,9 +38,6 @@ BOARD_RAMDISK_OFFSET     := 0x01000000
 
 TARGET_KERNEL_CONFIG := lineage_zl1_defconfig
 
-# HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
-
 # Partitions
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 58134835200
 
diff --git a/configs/nfc/libnfc-nci.conf b/configs/nfc/libnfc-nci.conf
deleted file mode 100644
index abca4a8..0000000
--- a/configs/nfc/libnfc-nci.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-###################### Start of libnfc-common.conf #######################
-
-###############################################################################
-# Application options
-APPL_TRACE_LEVEL=0x00
-PROTOCOL_TRACE_LEVEL=0x00
-
-NFC_DEBUG_ENABLED=0x00
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Force UICC to only listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F
-UICC_LISTEN_TECH_MASK=0x07
-
-###############################################################################
-# Configure the default Destination Gate used by HCI (the default is 4, which
-# is the ETSI loopback gate.
-NFA_HCI_DEFAULT_DEST_GATE=0xF0
-
-###############################################################################
-# Forcing HOST to listen for a selected protocol
-# 0x00 : Disable Host Listen
-# 0x01 : Enable Host to Listen (A)  for ISO-DEP tech A
-# 0x02 : Enable Host to Listen (B)  for ISO-DEP tech B
-# 0x04 : Enable Host to Listen (F)  for T3T Tag Type Protocol tech F
-# 0x07 : Enable Host to Listen (ABF)for ISO-DEP tech AB & T3T Tag Type Protocol tech F
-HOST_LISTEN_TECH_MASK=0x07
-
-###############################################################################
-# Enabling/Disabling Forward functionality
-# Disable           0x00
-# Enable            0x01
-NXP_FWD_FUNCTIONALITY_ENABLE=0x01
-
-###############################################################################
-# AID for Empty Select command
-# If specified, this AID will be substituted when an Empty SELECT command is
-# detected.  The first byte is the length of the AID.  Maximum length is 16.
-AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-
-###############################################################################
-# When screen is turned off, specify the desired power state of the controller.
-# 0: power-off-sleep state; DEFAULT
-# 1: full-power state
-# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
-SCREEN_OFF_POWER_STATE=1
-
-###############################################################################
-# Firmware patch format, Only 1 and 5 should be set
-#   0 -> NFC Default
-#   1 -> EMVCO Default
-#   3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  Removal process
-#   5 -> EMVCO Cert Polling, DISC_IDLE = Removal process  , DISC DEACTIVATE =   POWER_OFF
-#   7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE =  POWER_OFF
-NFA_CONFIG_FORMAT=2
-
-###############################################################################
-# Default poll duration (in ms)
-#  The defualt is 500ms if not set (see nfc_target.h)
-#NFA_DM_DISC_DURATION_POLL=333
-
-###############################################################################
-# Force tag polling for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
-#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
-#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_KOVIO |
-#            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE.
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A             0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_B             0x02    /* NFC Technology B             */
-# NFA_TECHNOLOGY_MASK_F             0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_ISO15693	    0x08    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_KOVIO	    0x20    /* Proprietary Technology       */
-# NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
-# NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-POLLING_TECH_MASK=0xCF
-
-###############################################################################
-# Force P2P to only listen for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-#            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
-#
-# Notable bits:
-# NFA_TECHNOLOGY_MASK_A	            0x01    /* NFC Technology A             */
-# NFA_TECHNOLOGY_MASK_F	            0x04    /* NFC Technology F             */
-# NFA_TECHNOLOGY_MASK_A_ACTIVE      0x40    /* NFC Technology A active mode */
-# NFA_TECHNOLOGY_MASK_F_ACTIVE      0x80    /* NFC Technology F active mode */
-P2P_LISTEN_TECH_MASK=0xC5
-
-PRESERVE_STORAGE=0x01
-
-###############################################################################
-# Deactivate notification wait time out in seconds used in ETSI Reader mode
-# 0 - Infinite wait
-NFA_DM_DISC_NTF_TIMEOUT=100
-
-###############################################################################
-# AID_MATCHING constants
-# AID_MATCHING_EXACT_ONLY 0x00
-# AID_MATCHING_EXACT_OR_PREFIX 0x01
-# AID_MATCHING_PREFIX_ONLY 0x02
-AID_MATCHING_MODE=0x01
-
-###############################################################################
diff --git a/configs/nfc/libnfc-nxp.conf b/configs/nfc/libnfc-nxp.conf
deleted file mode 100644
index 5d7e988..0000000
--- a/configs/nfc/libnfc-nxp.conf
+++ /dev/null
@@ -1,384 +0,0 @@
-## This file is used by NFC NXP NCI HAL(external/libnfc-nci/halimpl/pn547)
-## and NFC Service Java Native Interface Extensions (packages/apps/Nfc/nci/jni/extns/pn547)
-###############################################################################
-# Application options
-# Logging Levels
-# NXPLOG_DEFAULT_LOGLEVEL    0x01
-# ANDROID_LOG_DEBUG          0x03
-# ANDROID_LOG_WARN           0x02
-# ANDROID_LOG_ERROR          0x01
-# ANDROID_LOG_SILENT         0x00
-NXPLOG_EXTNS_LOGLEVEL=0x00
-NXPLOG_NCIHAL_LOGLEVEL=0x00
-NXPLOG_NCIX_LOGLEVEL=0x00
-NXPLOG_NCIR_LOGLEVEL=0x00
-NXPLOG_FWDNLD_LOGLEVEL=0x00
-NXPLOG_TML_LOGLEVEL=0x00
-
-###############################################################################
-# Nfc Device Node name
-NXP_NFC_DEV_NODE="/dev/nq-nci"
-
-###############################################################################
-# Extension for Mifare reader enable
-MIFARE_READER_ENABLE=0x01
-
-###############################################################################
-# Vzw Feature enable
-VZW_FEATURE_ENABLE=0x01
-
-###############################################################################
-# File name for Firmware
-NXP_FW_NAME="libpn548ad_fw.so"
-
-###############################################################################
-# System clock source selection configuration
-#define CLK_SRC_XTAL       1
-#define CLK_SRC_PLL        2
-NXP_SYS_CLK_SRC_SEL=0x02
-
-###############################################################################
-# System clock frequency selection configuration
-#define CLK_FREQ_13MHZ         1
-#define CLK_FREQ_19_2MHZ       2
-#define CLK_FREQ_24MHZ         3
-#define CLK_FREQ_26MHZ         4
-#define CLK_FREQ_32MHZ         5
-#define CLK_FREQ_38_4MHZ       6
-#define CLK_FREQ_52MHZ         7
-NXP_SYS_CLK_FREQ_SEL=0x02
-
-###############################################################################
-# The timeout value to be used for clock request acknowledgment
-# min value = 0x01 to max = 0x06
-NXP_SYS_CLOCK_TO_CFG=0x06
-
-###############################################################################
-# NXP proprietary settings
-NXP_ACT_PROP_EXTN={2F, 02, 00}
-
-###############################################################################
-# NFC forum profile settings
-NXP_NFC_PROFILE_EXTN={20, 02, 05, 01, A0, 44, 01, 00}
-
-###############################################################################
-# NFCC Configuration Control
-# Allow NFCC to manage RF Config       0x01
-# Don't allow NFCC to manage RF Config 0x00
-NXP_NFC_MERGE_RF_PARAMS={20, 02, 04, 01, 85, 01, 01}
-
-###############################################################################
-# Standby enable settings
-# NXP_CORE_STANDBY={2F, 00, 01, 01}
-
-###############################################################################
-# NXP TVDD configurations settings
-# Allow NFCC to configure External TVDD, There are currently three
-#configurations (1, 2 and 3) are supported, out of them only one can be
-#supported.
-NXP_EXT_TVDD_CFG=0x02
-
-###############################################################################
-#config1:SLALM, 3.3V for both RM and CM
-NXP_EXT_TVDD_CFG_1={20, 02, 0B, 02, A0, 66, 01, 00, A0, 0E, 03, 02, 09, 00}
-
-###############################################################################
-#config2: use DCDC in CE, use Tx_Pwr_Req, set CFG2 mode, SLALM,
-#monitoring 5V from DCDC, 4.7V for both RM and CM, DCDCWaitTime=4.2ms
-NXP_EXT_TVDD_CFG_2={20, 02, 0B, 02, A0, 66, 01, 00, A0, 0E, 03, 56, 64, 01 }
-
-###############################################################################
-#config3: use DCDC in CE, use Tx_Pwr_Req, SLALM, monitoring 5V from DCDC,
-#DCDCWaitTime=4.2ms
-NXP_EXT_TVDD_CFG_3={20, 02, 0B, 02, A0, 66, 01, 01, A0, 0E, 03, 52, 64, 0A}
-
-###############################################################################
-# Set configuration optimization decision setting
-# Enable    = 0x01
-# Disable   = 0x00
-NXP_SET_CONFIG_ALWAYS=0x00
-
-###############################################################################
-# Core configuration rf field filter settings to enable set to 01 to disable set
-# to 00 last bit
-NXP_CORE_RF_FIELD={ 20, 02, 05, 01, A0, 62, 01, 01 }
-
-###############################################################################
-# To enable i2c fragmentation set i2c fragmentation enable 0x01 to disable set
-# to 0x00
-NXP_I2C_FRAGMENTATION_ENABLED=0x00
-
-###############################################################################
-# Mifare Classic Key settings
-#NXP_CORE_MFCKEY_SETTING={20, 02, 25,04, A0, 51, 06, A0, A1, A2, A3, A4, A5,
-#                                     A0, 52, 06, D3, F7, D3, F7, D3, F7,
-#                                     A0, 53, 06, FF, FF, FF, FF, FF, FF,
-#                                     A0, 54, 06, 00, 00, 00, 00, 00, 00}
-
-###############################################################################
-# Default SE Options
-# No secure element 0x00
-# eSE               0x01
-# UICC              0x02
-NXP_DEFAULT_SE=0x02
-
-###############################################################################
-#Enable SWP full power mode when phone is power off
-NXP_SWP_FULL_PWR_ON=0x00
-
-###############################################################################
-#### Select the CHIP ####
-#PN547C2            0x01
-#PN65T              0x02
-#PN548AD            0x03
-#PN66T              0x04
-#PN551              0x05
-#PN67T              0x06
-NXP_NFC_CHIP=0x04
-
-###############################################################################
-# CE when Screen state is locked
-# This setting is for DEFAULT_AID_ROUTE,
-# DEFAULT_DESFIRE_ROUTE and DEFAULT_MIFARE_CLT_ROUTE
-# Disable           0x00
-# Enable            0x01
-NXP_CE_ROUTE_STRICT_DISABLE=0x01
-
-###############################################################################
-#Timeout in secs to get NFCEE Discover notification
-NXP_DEFAULT_NFCEE_DISC_TIMEOUT=20
-
-###############################################################################
-NXP_DEFAULT_NFCEE_TIMEOUT=20
-
-###############################################################################
-#Timeout in secs
-NXP_SWP_RD_START_TIMEOUT=0x0A
-
-###############################################################################
-#Timeout in secs
-NXP_SWP_RD_TAG_OP_TIMEOUT=0x01
-
-###############################################################################
-#Set the default AID route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_AID_ROUTE=0x02
-
-###############################################################################
-#Set the Mifare Desfire route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_DESFIRE_ROUTE=0x02
-
-###############################################################################
-#Set the Mifare CLT route Location :
-#This settings will be used when application does not set this parameter
-# host 0x00
-# eSE  0x01
-# UICC 0x02
-DEFAULT_MIFARE_CLT_ROUTE=0x02
-
-###############################################################################
-#Set the default AID Power state :
-#This settings will be used when application does not set this parameter
-# bit pos 0 = Switch On
-# bit pos 1 = Switch Off
-# bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
-DEFAULT_AID_PWR_STATE=0x19
-
-###############################################################################
-#Set the Mifare Desfire Power state :
-#This settings will be used when application does not set this parameter
-# bit pos 0 = Switch On
-# bit pos 1 = Switch Off
-# bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
-DEFAULT_DESFIRE_PWR_STATE=0x1B
-
-###############################################################################
-#Set the Mifare CLT Power state :
-#This settings will be used when application does not set this parameter
-# bit pos 0 = Switch On
-# bit pos 1 = Switch Off
-# bit pos 2 = Battery Off
-# bit pos 3 = Screen Lock
-# bit pos 4 = Screen Off
-DEFAULT_MIFARE_CLT_PWR_STATE=0x1B
-
-###############################################################################
-# AID Matching platform options
-# AID_MATCHING_L 0x01
-# AID_MATCHING_K 0x02
-AID_MATCHING_PLATFORM=0x01
-
-###############################################################################
-# P61 interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LS_DEFAULT_INTERFACE=0x01
-
-###############################################################################
-# P61 LTSM interface options
-# NFC 0x01
-# SPI 0x02
-NXP_P61_LTSM_DEFAULT_INTERFACE=0x01
-
-###############################################################################
-#CHINA_TIANJIN_RF_SETTING
-#Enable  0x01
-#Disable  0x00
-NXP_CHINA_TIANJIN_RF_ENABLED=0x01
-
-###############################################################################
-#SWP_SWITCH_TIMEOUT_SETTING
-# Allowed range of swp timeout setting is 0x00 to 0x3C [0 - 60].
-# Timeout in milliseconds, for example
-# No Timeout  0x00
-# 10 millisecond timeout 0x0A
-NXP_SWP_SWITCH_TIMEOUT=0x0A
-
-###############################################################################
-# P61 interface options for JCOP Download
-# NFC 0x01
-# SPI 0x02
-NXP_P61_JCOP_DEFAULT_INTERFACE=0x01
-
-###############################################################################
-# P61 JCOP OS download  options
-# FRAMEWORK API BY APPLICATION 0x00
-# AT BOOT_TIME 0x01
-NXP_JCOPDL_AT_BOOT_ENABLE=0x00
-
-###############################################################################
-# Loader service version
-# NFC service checks for LS version 2.0 or 2.1
-# LS2.0 0x20
-# LS2.1 0x21
-# LS2.2 0x22
-# AT NFC service intialization
-NXP_LOADER_SERVICE_VERSION=0x21
-
-###############################################################################
-#Timeout value  in milliseconds for NFCC standby mode.The range is between 5000
-#msec to 20000 msec and zero is to disable.
-NXP_NFCC_STANDBY_TIMEOUT=20000
-
-###############################################################################
-#Dynamic RSSI feature enable
-# Disable 0x00
-# Enable  0x01
-NXP_AGC_DEBUG_ENABLE=0x00
-
-###############################################################################
-#Virtual Mode ESE and Wired Mode ongoing delay Wired Mode
-# For Technology routing to ESE Technology Mask = 4
-# For ISO-DEP Protocol routing to ESE Mask      = 2
-# It can also take TECH|PROTO    = 6
-# To ignore the delay set mask to = 0
-NXP_ESE_WIRED_PRT_MASK=0x00
-
-###############################################################################
-#Virtual Mode UICC and Wired Mode  ongoing delay Wired Mode
-#For Technology routing to UICC Technology Mask = 4
-#For ISO-DEP Protocol routing to UICC set Mask  = 2
-#For Select AID Routing to UICC       set Mask  = 1
-#It can also take values TECH|PROTO|SELECT_AID  = 7 , 6 , 5 ,3 .To ignore delay
-#set mask = 0
-NXP_UICC_WIRED_PRT_MASK=0x00
-
-################################################################################
-#RF field true delay Wired Mode
-# delay wired mode = 1
-# allow wired mode = 0
-NXP_WIRED_MODE_RF_FIELD_ENABLE=0x00
-
-###############################################################################
-#Config to allow adding aids
-#NFC on/off is required after this config
-#1 = enabling adding aid  to NFCC routing table.
-#0 = disabling adding aid to NFCC routing table.
-NXP_ENABLE_ADD_AID=0x01
-
-###############################################################################
-# UICC mode supported
-# Disable           0x00
-# Enable            0x01
-NXP_DUAL_UICC_ENABLE=0x00
-
-###############################################################################
-# JCOP-3.3 continuous process timeout in msec and value should be in Hexadecimal
-# JCOP CP TIMEOUT
-# NXP_CP_TIMEOUT={00, 77}
-
-###############################################################################
-# Enable/Disable checking default proto SE Id
-# Disable           0x00
-# Enable            0x01
-NXP_CHECK_DEFAULT_PROTO_SE_ID=0x01
-
-###############################################################################
-# SVDD sync off Delay in ms it can be max 20 ms
-# If out of range timeout used, default delay of 10ms will be set
-NXP_SVDD_SYNC_OFF_DELAY=10
-
-###############################################################################
-#NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE
-#Enable/Disable block number checks for china transit use case
-#Enable  0x01
-#Disable  0x00
-NXP_CN_TRANSIT_BLK_NUM_CHECK_ENABLE=0x01
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined, the default value is 1.
-# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
-# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
-# 2 NFA_RW_PRES_CHK_ISO_DEP_NAK; Type - 4 tag protocol iso-dep nak presence check
-PRESENCE_CHECK_ALGORITHM=1
-
-###############################################################################
-# Configure the single default SE to use.  The default is to use the first
-# SE that is detected by the stack.  This value might be used when the phone
-# supports multiple SE (e.g. 0xC0 and 0x80) but you want to force it to use
-# one of them (e.g. 0xC0).
-# host  0x00
-# eSE   0x01
-# UICC  0x02
-DEFAULT_OFFHOST_ROUTE=0x02
-
-###############################################################################
-# Vendor Specific Proprietary Protocol & Discovery Configuration
-# Set to 0xFF if unsupported
-#  byte[0] NCI_PROTOCOL_18092_ACTIVE
-#  byte[1] NCI_PROTOCOL_B_PRIME
-#  byte[2] NCI_PROTOCOL_DUAL
-#  byte[3] NCI_PROTOCOL_15693
-#  byte[4] NCI_PROTOCOL_KOVIO
-#  byte[5] NCI_PROTOCOL_MIFARE
-#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
-#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
-#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={05, FF, FF, 06, 81, 80, 70, FF, FF}
-
-###############################################################################
-# Bail out mode
-#  If set to 1, NFCC is using bail out mode for either Type A or Type B poll.
-NFA_POLL_BAIL_OUT_MODE=0x01
-
-#################################################################################
-# Set max transceive length for IsoDep frames
-# Standard      0x105 (261)
-# Extended      0xFEFF (65279)
-ISO_DEP_MAX_TRANSCEIVE=0xFEFF
-
-###############################################################################
-#White list of Hosts
-#This values will be the Hosts(NFCEEs) in the HCI Network.
-DEVICE_HOST_WHITE_LIST={80 : 81 : C0}
diff --git a/configs/nfc/libnfc-nxp_RF.conf b/configs/nfc/libnfc-nxp_RF.conf
deleted file mode 100644
index 6910652..0000000
--- a/configs/nfc/libnfc-nxp_RF.conf
+++ /dev/null
@@ -1,229 +0,0 @@
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_1={
-    20, 02, F7, 20, 
-    A0, 0D, 03, 00, 40, 01,
-    A0, 0D, 06, 00, FF, 05, 04, 06, 00,
-    A0, 0D, 06, 00, 35, FF, 01, FF, 02,
-    A0, 0D, 06, 00, 33, 07, 40, 00, 00,
-    A0, 0D, 03, 02, 40, 00,
-    A0, 0D, 03, 04, 47, 02,
-    A0, 0D, 06, 04, 35, F4, 01, F4, 01,
-    A0, 0D, 06, 05, 45, 80, 40, 00, 00,
-    A0, 0D, 06, 05, 35, FF, 01, FF, 02,
-    A0, 0D, 06, 05, 33, 07, 40, 00, 00,
-    A0, 0D, 06, 06, 44, A3, 90, 03, 00,
-    A0, 0D, 03, 06, 47, 02,
-    A0, 0D, 06, 06, 35, FF, 03, FF, 03,
-    A0, 0D, 06, 06, 34, F7, 7F, 00, 10,
-    A0, 0D, 06, 06, 33, 03, 40, 00, 00,
-    A0, 0D, 06, 06, 30, C8, 00, 64, 00,
-    A0, 0D, 06, 06, 2F, AF, 05, 80, 17,
-    A0, 0D, 06, 06, 03, 00, 70, 00, 20,
-    A0, 0D, 06, 06, 45, 80, 40, 00, 00,
-    A0, 0D, 03, 06, 43, 20,
-    A0, 0D, 06, 06, 42, 00, 00, F2, F2,
-    A0, 0D, 03, 06, 41, 40,
-    A0, 0D, 03, 06, 37, 08,
-    A0, 0D, 03, 06, 16, 00,
-    A0, 0D, 03, 06, 15, 00,
-    A0, 0D, 03, 06, 17, 08,
-    A0, 0D, 03, 06, 3F, 04,
-    A0, 0D, 03, 06, 80, 03,
-    A0, 0D, 03, 07, 3F, 00,
-    A0, 0D, 06, 07, 35, FF, 01, FF, 02,
-    A0, 0D, 03, 16, 41, 8E,
-    A0, 0D, 06, 18, 34, 00, 00, E1, 03
-}
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_2={
-    20, 02, FA, 1E, 
-    A0, 0D, 06, 18, 33, 0F, 83, 00, 00,
-    A0, 0D, 03, 1A, 41, 8E,
-    A0, 0D, 06, 1C, 34, 00, 00, E1, 03,
-    A0, 0D, 06, 1C, 33, 0F, 83, 00, 00,
-    A0, 0D, 06, 20, 4A, 00, 00, 00, 00,
-    A0, 0D, 06, 20, 42, 88, 10, FF, FF,
-    A0, 0D, 03, 20, 41, 82,
-    A0, 0D, 06, 32, 42, F8, 10, FF, FF,
-    A0, 0D, 06, 32, 41, 82, 07, 00, 00,
-    A0, 0D, 03, 32, 16, 00,
-    A0, 0D, 03, 32, 15, 01,
-    A0, 0D, 06, 32, 4A, 33, 07, 00, 08,
-    A0, 0D, 06, 34, 2D, 24, A7, 0C, 00,
-    A0, 0D, 06, 34, 34, 00, 00, EC, 03,
-    A0, 0D, 06, 34, 33, 0F, 01, 01, 70,
-    A0, 0D, 04, 34, 44, 22, 00,
-    A0, 0D, 06, 38, 4A, 33, 07, 00, 08,
-    A0, 0D, 06, 38, 42, 68, 10, FF, FF,
-    A0, 0D, 04, 3A, 44, 26, 00,
-    A0, 0D, 06, 3A, 2D, 15, 47, 0D, 00,
-    A0, 0D, 06, 3A, 34, 00, 00, E1, 03,
-    A0, 0D, 06, 3A, 33, 0B, 83, 00, 00,
-    A0, 0D, 06, 3C, 4A, 52, 07, 00, 1B,
-    A0, 0D, 06, 3C, 42, 68, 10, FF, FF,
-    A0, 0D, 04, 3E, 44, 26, 00,
-    A0, 0D, 06, 3E, 2D, 15, 47, 0D, 00,
-    A0, 0D, 06, 3E, 34, 00, 00, E1, 03,
-    A0, 0D, 06, 3E, 33, 0B, 83, 00, 00,
-    A0, 0D, 03, 40, 41, 8E,
-    A0, 0D, 06, 40, 42, F0, 10, FF, FF
-}
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_3={
-    20, 02, F8, 1D, 
-    A0, 0D, 06, 40, 4A, 12, 07, 00, 00,
-    A0, 0D, 04, 42, 44, 26, 00,
-    A0, 0D, 06, 42, 2D, 15, 47, 0D, 00,
-    A0, 0D, 06, 42, 34, 00, 00, E1, 03,
-    A0, 0D, 06, 42, 33, 0B, 83, 00, 00,
-    A0, 0D, 04, 46, 44, 26, 00,
-    A0, 0D, 06, 46, 2D, 15, 25, 0D, 00,
-    A0, 0D, 06, 44, 4A, 21, 07, 00, 07,
-    A0, 0D, 06, 44, 42, 88, 10, FF, FF,
-    A0, 0D, 04, 4A, 44, 21, 00,
-    A0, 0D, 06, 4A, 2D, 15, 9D, 0D, 00,
-    A0, 0D, 06, 48, 4A, 21, 07, 00, 07,
-    A0, 0D, 06, 48, 42, 88, 10, FF, FF,
-    A0, 0D, 04, 4E, 44, 26, 00,
-    A0, 0D, 06, 4E, 2D, 15, 25, 0D, 00,
-    A0, 0D, 06, 4C, 4A, 21, 07, 00, 07,
-    A0, 0D, 06, 4C, 42, 88, 10, FF, FF,
-    A0, 0D, 04, 52, 44, 26, 00,
-    A0, 0D, 06, 52, 2D, 15, 25, 0D, 00,
-    A0, 0D, 06, 50, 42, 90, 10, FF, FF,
-    A0, 0D, 06, 50, 4A, 21, 07, 00, 07,
-    A0, 0D, 06, 56, 2D, 05, 8E, 0C, 00,
-    A0, 0D, 04, 56, 44, 23, 00,
-    A0, 0D, 06, 5C, 2D, 05, 9E, 0C, 00,
-    A0, 0D, 04, 5C, 44, 26, 00,
-    A0, 0D, 06, 54, 42, 88, 10, FF, FF,
-    A0, 0D, 06, 5A, 42, 90, 10, FF, FF,
-    A0, 0D, 06, 98, 2F, CF, 05, 80, 17,
-    A0, 0D, 06, 98, 42, 00, 00, F2, F2
-}
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_4={
-    20, 02, F7, 1C, 
-    A0, 0D, 06, 9A, 42, 00, 00, F2, F2,
-    A0, 0D, 06, 30, 44, 12, 90, 03, 00,
-    A0, 0D, 06, 6C, 44, A3, 90, 03, 00,
-    A0, 0D, 03, 70, 2E, 40,
-    A0, 0D, 03, 70, 45, 30,
-    A0, 0D, 06, 70, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 74, 2F, 6F, 05, 80, 12,
-    A0, 0D, 06, 74, 30, D5, 00, 40, 00,
-    A0, 0D, 06, 74, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 78, 2F, 3F, 07, 80, C1,
-    A0, 0D, 06, 78, 30, 50, 00, 10, 00,
-    A0, 0D, 06, 78, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 7C, 2F, CF, 05, 80, 17,
-    A0, 0D, 06, 7C, 30, C8, 00, 64, 00,
-    A0, 0D, 06, 7C, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 80, 2F, CF, 05, 80, 17,
-    A0, 0D, 06, 80, 30, C8, 00, 64, 00,
-    A0, 0D, 06, 80, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 84, 2F, CF, 05, 80, 17,
-    A0, 0D, 06, 84, 30, C8, 00, 64, 00,
-    A0, 0D, 06, 84, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 88, 2F, B1, 05, 80, 17,
-    A0, 0D, 06, 88, 30, A8, 00, 64, 00,
-    A0, 0D, 06, 88, 44, A3, 90, 03, 00,
-    A0, 0D, 06, 8E, 44, 12, 90, 03, 00,
-    A0, 0D, 06, 94, 44, 12, 90, 03, 00,
-    A0, 0D, 06, 10, 35, FF, 01, FF, 02,
-    A0, 0D, 06, 10, 34, F7, 7F, 00, 00
-}
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_5={
-    20, 02, 7F, 10, 
-    A0, 0D, 06, 6A, 42, F8, 10, FF, FF,
-    A0, 0D, 06, 8C, 42, 88, 10, FF, FF,
-    A0, 0D, 06, 92, 42, 90, 10, FF, FF,
-    A0, 0D, 03, 24, 41, 40,
-    A0, 0D, 06, 24, 42, 00, 00, F2, F2,
-    A0, 0D, 03, 28, 41, 40,
-    A0, 0D, 03, 8A, 41, 40,
-    A0, 0D, 03, 90, 41, 40,
-    A0, 0D, 03, 08, 40, 10,
-    A0, 0D, 06, 08, 45, C0, 82, 00, 00,
-    A0, 0D, 06, 0A, 45, 80, 40, 00, 00,
-    A0, 0D, 06, 0A, 30, C8, 00, 64, 00,
-    A0, 0D, 06, 0A, 2F, AF, 05, 80, 17,
-    A0, 0D, 06, 0A, 34, 26, 65, E5, 03,
-    A0, 0D, 06, 0A, 33, 0F, 01, 00, 70,
-    A0, 0D, 03, 0A, 40, 00
-}
-
-###############################################################################
-# NXP RF configuration ALM/PLM settings
-# This section needs to be updated with the correct values based on the platform
-NXP_RF_CONF_BLK_6={
-}
-
-###############################################################################
-# Core configuration extensions
-# It includes
-# Wired mode settings A0ED, A0EE
-# Tag Detector A040, A041, A043
-# Low Power mode A007
-# Clock settings A002, A003
-# PbF settings A008
-# Clock timeout settings A004
-# A0 9F 02 <svdd ON guard time (msec)> <svdd off guard time(msec)>
-NXP_CORE_CONF_EXTN={20, 02, 73, 13,
-    A0, 02, 01, 01,
-    A0, 09, 02, 90, 01,
-    A0, 12, 01, 02,
-    A0, 40, 01, 01,
-    A0, 41, 01, 0D,
-    A0, 42, 01, 0F,
-    A0, 43, 01, 03,
-    A0, 5E, 01, 01,
-    A0, 61, 01, 53,
-    A0, 96, 01, 01,
-    A0, 9F, 02, 08, 08,
-    A0, DD, 01, 2D,
-    A0, EC, 01, 01,
-    A0, ED, 01, 83,
-    A0, F2, 01, 00,
-    A0, 47, 02, 00, 27,
-    A0, 85, 04, 10, 08, 28, 00,
-    A0, 1D, 11, 51, 33, 14, 17, 00, AA, 85, 00, 80, 55, 2A, 04, 00, 63, 00, 00, 00,
-    A0, 1E, 11, 1C, 13, 14, 14, 00, 6F, 97, 00, 00, 00, 10, 04, 00, 63, 02, 00, 00
-}
-
-###############################################################################
-# Core configuration settings
-NXP_CORE_CONF={20, 02, 2A, 0E,
-    18, 01, 01,
-    21, 01, 00,
-    28, 01, 00,
-    30, 01, 04,
-    31, 01, 00,
-    33, 00,
-    50, 01, 02,
-    54, 01, 06,
-    5B, 01, 00,
-    60, 01, 0E,
-    80, 01, 01,
-    81, 01, 01,
-    82, 01, 0E,
-    32, 01, 60
-}
-
-###############################################################################
-
diff --git a/device.mk b/device.mk
index 3fbe9ec..0f161bc 100644
--- a/device.mk
+++ b/device.mk
@@ -62,28 +62,6 @@ PRODUCT_PACKAGES += \
     fakelogprint \
     libshims_gxfpd
 
-# NFC
-PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.1-service \
-    com.android.nfc_extras \
-    NfcNci \
-    nqnfcee_access.xml \
-    nqnfcse_access.xml \
-    SecureElement \
-    Tag
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \
-    $(LOCAL_PATH)/configs/nfc/libnfc-nxp_RF.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp_RF.conf \
-    $(LOCAL_PATH)/configs/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
-    frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
-    frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
-    frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
-
 # Vendor properties
 -include $(LOCAL_PATH)/vendor_prop.mk
 
diff --git a/manifest.xml b/manifest.xml
deleted file mode 100644
index c314d1d..0000000
--- a/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-     <hal format="hidl">
-         <name>android.hardware.nfc</name>
-         <transport>hwbinder</transport>
-         <version>1.1</version>
-         <interface>
-             <name>INfc</name>
-             <instance>default</instance>
-         </interface>
-     </hal>
-</manifest>
diff --git a/prebuilt/vendor/etc/init/hw/init.device.rc b/prebuilt/vendor/etc/init/hw/init.device.rc
index 648e512..4531a9e 100644
--- a/prebuilt/vendor/etc/init/hw/init.device.rc
+++ b/prebuilt/vendor/etc/init/hw/init.device.rc
@@ -27,11 +27,3 @@
 
 on boot
     chmod 0644 /dev/smartpa_f0_detect
-
-    # NFC
-    chmod 0666 /dev/pn544
-    chown nfc nfc /dev/pn544
-
-on post-fs-data
-    # Nfc
-    mkdir /data/vendor/nfc 0770 nfc nfc
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 6a668a5..2576520 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -230,9 +230,6 @@ lib64/libfp_client5118m.so:vendor/lib64/libfp_client5118m.so|b115345ac2b5702c2fa
 lib64/libfpnav5118m.so:vendor/lib64/libfpnav5118m.so
 lib64/libfpservice5118m.so:vendor/lib64/libfpservice5118m.so|188d19de45579a41c06a751b8ac43cb3584c5610
 
-# NFC firmware - from oneplus3 - 9/PKQ1.181203.001/1903190014
-vendor/lib/libpn548ad_fw.so|e78f2c9e7a5cb0001d2f71a69f37ec8261fb05b8
-
 # Offline charger
 vendor/bin/charger|93f3883cc2fd0d271d559408d760b0ed71ac2928
 
diff --git a/sepolicy/private/hwservice_contexts b/sepolicy/private/hwservice_contexts
deleted file mode 100644
index 80f2a07..0000000
--- a/sepolicy/private/hwservice_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-vendor.nxp.nxpese::INxpEse u:object_r:nxpese_hwservice:s0
-vendor.nxp.nxpnfc::INxpNfc u:object_r:nxpnfc_hwservice:s0
diff --git a/sepolicy/vendor/hal_nfc_default.te b/sepolicy/vendor/hal_nfc_default.te
deleted file mode 100644
index 7a5ce49..0000000
--- a/sepolicy/vendor/hal_nfc_default.te
+++ /dev/null
@@ -1,10 +0,0 @@
-typeattribute hal_nfc_default data_between_core_and_vendor_violators;
-allow hal_nfc_default nfc_data_file:dir { search getattr };
-allow hal_nfc_default nfc_data_file:file { rw_file_perms };
-
-allow hal_nfc_default nfc_vendor_data_file:dir { rw_dir_perms };
-allow hal_nfc_default nfc_vendor_data_file:file { create_file_perms };
-
-allow hal_nfc_default nxpese_hwservice:hwservice_manager { add find };
-allow hal_nfc_default nxpnfc_hwservice:hwservice_manager { add find };
-
diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te
deleted file mode 100644
index 37762d9..0000000
--- a/sepolicy/vendor/hwservice.te
+++ /dev/null
@@ -1,2 +0,0 @@
-type nxpese_hwservice, hwservice_manager_type;
-type nxpnfc_hwservice, hwservice_manager_type;
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 162d0a2..dbf278e 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -12,10 +12,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.sf.lcd_density=420
 
-# NFC
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.nfc.port=I2C
-
 # Fingerprint
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.qfp=false \