projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 43465b7)
NFC: nfcmrvl: Allow ISO15693 protocol
authorVincent Cuissard <cuissard@marvell.com>
Fri, 12 Jun 2015 13:35:52 +0000 (15:35 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Fri, 12 Jun 2015 22:07:56 +0000 (00:07 +0200)
Reference Marvell NFC controller as ISO15693 capable.

Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/nfcmrvl/main.c patch | blob | blame | history

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index e317a69a45609e2c5ebd492cda107af67187e4e1..54ed8acc2a71fc1dc8312f837d4db66182f869bd 100644 (file)
--- 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,
                | NFC_PROTO_FELICA_MASK
                | NFC_PROTO_ISO14443_MASK
                | NFC_PROTO_ISO14443_B_MASK
+               | NFC_PROTO_ISO15693_MASK
                | NFC_PROTO_NFC_DEP_MASK;
 
        priv->ndev = nci_allocate_device(&nfcmrvl_nci_ops, protocols,