aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-06-12 09:35:52 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-12 18:07:56 -0400
commit83d567259b943bbe85aba563b521f7b5611c6a1c (patch)
tree7b961f1cbd1f4a4019573982a7c1e86f661697cb
parent43465b7af2e6c0cdcbe4771fa268786f2ccd642d (diff)
NFC: nfcmrvl: Allow ISO15693 protocol
Reference Marvell NFC controller as ISO15693 capable. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/nfc/nfcmrvl/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index e317a69a4560..54ed8acc2a71 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -129,6 +129,7 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
129 | NFC_PROTO_FELICA_MASK 129 | NFC_PROTO_FELICA_MASK
130 | NFC_PROTO_ISO14443_MASK 130 | NFC_PROTO_ISO14443_MASK
131 | NFC_PROTO_ISO14443_B_MASK 131 | NFC_PROTO_ISO14443_B_MASK
132 | NFC_PROTO_ISO15693_MASK
132 | NFC_PROTO_NFC_DEP_MASK; 133 | NFC_PROTO_NFC_DEP_MASK;
133 134
134 priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols, 135 priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols,