diff options
author | Vincent Cuissard <cuissard@marvell.com> | 2015-06-12 09:35:54 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-06-12 18:08:55 -0400 |
commit | d0dcad8bd32a34aa85bcbd5d2033658cb3964377 (patch) | |
tree | c6230465d6ea99e7bd64f76d2d6745955c2b9a58 | |
parent | 34ac49664149dd8923e0de5d871f86c80292d27b (diff) |
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>
-rw-r--r-- | drivers/nfc/nfcmrvl/main.c | 3 | ||||
-rw-r--r-- | drivers/nfc/nfcmrvl/nfcmrvl.h | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index 54ed8acc2a71..4a8866d62941 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) | |||
82 | 82 | ||
83 | static int nfcmrvl_nci_setup(struct nci_dev *ndev) | 83 | static int nfcmrvl_nci_setup(struct nci_dev *ndev) |
84 | { | 84 | { |
85 | __u8 val = 1; | ||
86 | |||
87 | nci_set_config(ndev, NFCMRVL_PB_BAIL_OUT, 1, &val); | ||
85 | return 0; | 88 | return 0; |
86 | } | 89 | } |
87 | 90 | ||
diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h index 09780d57c9b8..e5a7e5464f2e 100644 --- a/drivers/nfc/nfcmrvl/nfcmrvl.h +++ b/drivers/nfc/nfcmrvl/nfcmrvl.h | |||
@@ -33,6 +33,12 @@ | |||
33 | #define NFCMRVL_NCI_MAX_EVENT_SIZE 260 | 33 | #define NFCMRVL_NCI_MAX_EVENT_SIZE 260 |
34 | 34 | ||
35 | /* | 35 | /* |
36 | ** NCI FW Parmaters | ||
37 | */ | ||
38 | |||
39 | #define NFCMRVL_PB_BAIL_OUT 0x11 | ||
40 | |||
41 | /* | ||
36 | ** HCI defines | 42 | ** HCI defines |
37 | */ | 43 | */ |
38 | 44 | ||