diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-17 13:16:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-17 13:16:50 -0400 |
| commit | 20d83f2464c0d1e27b24d654aa5495dcc44759c0 (patch) | |
| tree | a6c36d9e48920f6d81b7dac9ad6b1f99dfdaf592 /Makefile | |
| parent | 5f667642f4b290b04d88d5ca926fba81fed6180d (diff) | |
| parent | 29e27dd86b5c4f8e6feb62d7b6a8491539ff1ef1 (diff) | |
Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"NFC: 3.15: First pull request
This is the NFC pull request for 3.15. With this one we have:
- Support for ISO 15693 a.k.a. NFC vicinity a.k.a. Type 5 tags. ISO
15693 are long range (1 - 2 meters) vicinity tags/cards. The kernel
now supports those through the NFC netlink and digital APIs.
- Support for TI's trf7970a chipset. This chipset relies on the NFC
digital layer and the driver currently supports type 2, 4A and 5 tags.
- Support for NXP's pn544 secure firmare download. The pn544 C3 chipsets
relies on a different firmware download protocal than the C2 one. We
now support both and use the right one depending on the version we
detect at runtime.
- Support for 4A tags from the NFC digital layer.
- A bunch of cleanups and minor fixes from Axel Lin and Thierry Escande."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions