summaryrefslogtreecommitdiffstats
path: root/drivers/nfc/st-nci/core.c
diff options
context:
space:
mode:
authorChristophe Ricard2015-10-25 22:54:39 +0100
committerSamuel Ortiz2015-10-27 03:55:10 +0100
commit3648dc6d27f648b8e3ce9b48874627a833d53c3a (patch)
tree196aee67d701a3856d0ca3bfed0d43f1de20d0c6 /drivers/nfc/st-nci/core.c
parentNFC: netlink: Add missing NFC_ATTR comments (diff)
downloadkernel-qcow2-linux-3648dc6d27f648b8e3ce9b48874627a833d53c3a.tar.gz
kernel-qcow2-linux-3648dc6d27f648b8e3ce9b48874627a833d53c3a.tar.xz
kernel-qcow2-linux-3648dc6d27f648b8e3ce9b48874627a833d53c3a.zip
NFC: st-nci: Add ese-present/uicc-present dts properties
In order to align with st21nfca, dts configuration properties ese_present and uicc_present are made available in st-nci driver. So far, in early development firmware, because nci_nfcee_mode_set(DISABLE) was not supported we had to try to enable it during the secure element discovery phase. After several trials on commercial and qualified firmware it appears that nci_nfcee_mode_set(ENABLE) and nci_nfcee_mode_set(DISABLE) are properly supported. Such feature also help us to eventually save some time (~5ms) when only one secure element is connected. Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st-nci/core.c')
-rw-r--r--drivers/nfc/st-nci/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/st-nci/core.c b/drivers/nfc/st-nci/core.c
index 73d36dd8345c..c693128ee6fb 100644
--- a/drivers/nfc/st-nci/core.c
+++ b/drivers/nfc/st-nci/core.c
@@ -123,7 +123,7 @@ static struct nci_ops st_nci_ops = {
};
int st_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
- int phy_tailroom)
+ int phy_tailroom, struct st_nci_se_status *se_status)
{
struct st_nci_info *info;
int r;
@@ -164,7 +164,7 @@ int st_nci_probe(struct llt_ndlc *ndlc, int phy_headroom,
goto err_reg_dev;
}
- return st_nci_se_init(ndlc->ndev);
+ return st_nci_se_init(ndlc->ndev, se_status);
err_reg_dev:
nci_free_device(ndlc->ndev);