summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-06-12 15:35:54 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-13 00:08:55 +0200
commitd0dcad8bd32a34aa85bcbd5d2033658cb3964377 (patch)
treec6230465d6ea99e7bd64f76d2d6745955c2b9a58 /drivers/nfc
parent34ac49664149dd8923e0de5d871f86c80292d27b (diff)
downloadop-kernel-dev-d0dcad8bd32a34aa85bcbd5d2033658cb3964377.zip
op-kernel-dev-d0dcad8bd32a34aa85bcbd5d2033658cb3964377.tar.gz
NFC: nfcmrvl: set PB_BAIL_OUT at setup
PB_BAIL_OUT parameter as to be set to one. This is needed because digital protocol 1.0 is used in combination with ISO15693 protocol. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/nfcmrvl/main.c3
-rw-r--r--drivers/nfc/nfcmrvl/nfcmrvl.h6
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 54ed8ac..4a8866d 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -82,6 +82,9 @@ static int nfcmrvl_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
static int nfcmrvl_nci_setup(struct nci_dev *ndev)
{
+ __u8 val = 1;
+
+ nci_set_config(ndev, NFCMRVL_PB_BAIL_OUT, 1, &val);
return 0;
}
diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index 09780d5..e5a7e54 100644
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -33,6 +33,12 @@
#define NFCMRVL_NCI_MAX_EVENT_SIZE 260
/*
+** NCI FW Parmaters
+*/
+
+#define NFCMRVL_PB_BAIL_OUT 0x11
+
+/*
** HCI defines
*/
OpenPOWER on IntegriCloud