summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2014-03-10 11:56:23 -0700
committerSamuel Ortiz <sameo@linux.intel.com>2014-03-11 00:47:08 +0100
commit8006289108fa9635d16a65d9db16da06d7dce201 (patch)
treed887104031c3635112d05cdae1ad251219bebc98 /drivers/nfc
parent165063f1dac43e48ceb907490fff0a8413b9a32d (diff)
downloadlinux-8006289108fa9635d16a65d9db16da06d7dce201.tar.gz
linux-8006289108fa9635d16a65d9db16da06d7dce201.tar.bz2
linux-8006289108fa9635d16a65d9db16da06d7dce201.zip
NFC: trf7970a: Add support for Type 4A Tags
Add support for Type 4A Tags which includes supporting the underlying ISO/IEC 14443-A protocol. Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/trf7970a.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 0d62d45d6884..516d0a616cbe 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -87,7 +87,8 @@
* the trf7970a_per_cmd_config() routine.
*/
-#define TRF7970A_SUPPORTED_PROTOCOLS NFC_PROTO_MIFARE_MASK
+#define TRF7970A_SUPPORTED_PROTOCOLS \
+ (NFC_PROTO_MIFARE_MASK | NFC_PROTO_ISO14443_MASK)
/* TX data must be prefixed with a FIFO reset cmd, a cmd that depends
* on what the current framing is, the address of the TX length byte 1
@@ -821,6 +822,7 @@ static int trf7970a_config_framing(struct trf7970a *trf, int framing)
trf->iso_ctrl |= TRF7970A_ISO_CTRL_RX_CRC_N;
break;
case NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A:
+ case NFC_DIGITAL_FRAMING_NFCA_T4T:
trf->tx_cmd = TRF7970A_CMD_TRANSMIT;
trf->iso_ctrl &= ~TRF7970A_ISO_CTRL_RX_CRC_N;
break;