aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc/nfcwilink.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-07-03 18:14:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-07-09 16:42:24 -0400
commit01d719a2287ec34f631800d10f1fad3c134c3e89 (patch)
tree9b718a6c24ad36433f15febdc52ed25b23f41847 /drivers/nfc/nfcwilink.c
parenta1fbbf1817c671a396b7ae3832bdfab63acea2e5 (diff)
NFC: Add ISO 14443 type B protocol
Some devices (e.g. Sony's PaSoRi) can not do type B polling, so we have to make a distinction between ISO14443 type A and B poll modes. Cc: Eric Lapuyade <eric.lapuyade@intel.com> Cc: Ilan Elias <ilane@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/nfcwilink.c')
-rw-r--r--drivers/nfc/nfcwilink.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 1f74a77d040d..e7fd4938f9bc 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -535,9 +535,10 @@ static int nfcwilink_probe(struct platform_device *pdev)
535 drv->pdev = pdev; 535 drv->pdev = pdev;
536 536
537 protocols = NFC_PROTO_JEWEL_MASK 537 protocols = NFC_PROTO_JEWEL_MASK
538 | NFC_PROTO_MIFARE_MASK | NFC_PROTO_FELICA_MASK 538 | NFC_PROTO_MIFARE_MASK | NFC_PROTO_FELICA_MASK
539 | NFC_PROTO_ISO14443_MASK 539 | NFC_PROTO_ISO14443_MASK
540 | NFC_PROTO_NFC_DEP_MASK; 540 | NFC_PROTO_ISO14443_B_MASK
541 | NFC_PROTO_NFC_DEP_MASK;
541 542
542 drv->ndev = nci_allocate_device(&nfcwilink_ops, 543 drv->ndev = nci_allocate_device(&nfcwilink_ops,
543 protocols, 544 protocols,