diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:52 +0100 |
| commit | 69c660085eb50bacf77e363268ab495dcff1338f (patch) | |
| tree | 93242f5b5ceb12f8451cad391323cc830bcb102c /drivers | |
| parent | 59ef9b16b2ef800c2ef87cf31545e99e5a510dd3 (diff) | |
| parent | 868fe98816e03aaf7b10960dfc2a01ad2c701ccc (diff) | |
| download | linux-next-history-69c660085eb50bacf77e363268ab495dcff1338f.tar.gz | |
Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nfc/nxp-nci/core.c | 1 | ||||
| -rw-r--r-- | drivers/nfc/trf7970a.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c index 66b198663387a..448e5a4e7338f 100644 --- a/drivers/nfc/nxp-nci/core.c +++ b/drivers/nfc/nxp-nci/core.c @@ -25,6 +25,7 @@ NFC_PROTO_FELICA_MASK | \ NFC_PROTO_ISO14443_MASK | \ NFC_PROTO_ISO14443_B_MASK | \ + NFC_PROTO_ISO15693_MASK | \ NFC_PROTO_NFC_DEP_MASK) #define NXP_NCI_RF_PLL_UNLOCKED_NTF nci_opcode_pack(NCI_GID_RF_MGMT, 0x21) diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 08c27bb438b59..f22e091019dee 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -61,15 +61,15 @@ * support that. So, if an abort is received before trf7970a_send_cmd() * has sent the command to the tag, it simply returns -ECANCELED. If the * command has already been sent to the tag, then the driver continues - * normally and recieves the response data (or error) but just before + * normally and receives the response data (or error) but just before * sending the data upstream, it frees the rx_skb and sends -ECANCELED * upstream instead. If the command failed, that error will be sent * upstream. * - * When recieving data from a tag and the interrupt status register has + * When receiving data from a tag and the interrupt status register has * only the SRX bit set, it means that all of the data has been received * (once what's in the fifo has been read). However, depending on timing - * an interrupt status with only the SRX bit set may not be recived. In + * an interrupt status with only the SRX bit set may not be received. In * those cases, the timeout mechanism is used to wait 20 ms in case more * data arrives. After 20 ms, it is assumed that all of the data has been * received and the accumulated rx data is sent upstream. The |