diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-11 20:00:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-11 20:00:54 -0400 |
| commit | 631ad4a3e74d998b089e75983c0c5bf893c94b62 (patch) | |
| tree | c66cf156a5a6a3d168dfbcfddee480d059a1c1ec /drivers/nfc/st21nfca/se.c | |
| parent | 6a47a570321fdcd2b6fc9e6537b2a3650d0fd04b (diff) | |
| parent | b31d5103c33280738188c51e226224dff4401c7b (diff) | |
| download | linux-631ad4a3e74d998b089e75983c0c5bf893c94b62.tar.bz2 | |
Merge tag 'nfc-next-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.7 pull request
This is the first NFC pull request for 4.7. With this one we
mainly have:
- Support for NXP's pn532 NFC chipset. The pn532 is based on the same
microcontroller as the pn533, but it talks to the host through i2c
instead of USB. By separating the pn533 driver into core and PHY
parts, we can not add the i2c layer and support the pn532 chipset.
- Support for NCI's loopback mode. This is a testing mode where each
packet received by the NFCC is sent back to the DH, allowing the
host to test that the controller can receive and send data.
- A few ACPI related fixes for the STMicro drivers, in order to match
the device tree naming scheme.
- A bunch of cleanups for the st-nci and the st21nfca STMicro drivers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/st21nfca/se.c')
| -rw-r--r-- | drivers/nfc/st21nfca/se.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index bd56a16e4007..3a98563d4a12 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -32,8 +32,6 @@ #define ST21NFCA_EVT_CONNECTIVITY 0x10 #define ST21NFCA_EVT_TRANSACTION 0x12 -#define ST21NFCA_ESE_HOST_ID 0xc0 - #define ST21NFCA_SE_TO_HOT_PLUG 1000 /* Connectivity pipe only */ #define ST21NFCA_SE_COUNT_PIPE_UICC 0x01 |