NFC: nxp-nci: Add support for NXP NCI chips

Add support for NXP NCI NFC controllers such as the NPC100 or PN7150
families.

Signed-off-by: Clément Perrochaud <clement.perrochaud@effinnov.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c201655..12fdf22 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6937,6 +6937,13 @@ S:       Supported
 F:     drivers/block/nvme*
 F:     include/linux/nvme.h
 
+NXP-NCI NFC DRIVER
+M:     Clément Perrochaud <clement.perrochaud@effinnov.com>
+R:     Charles Gorand <charles.gorand@effinnov.com>
+L:     linux-nfc@lists.01.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/nfc/nxp-nci
+
 NXP TDA998X DRM DRIVER
 M:     Russell King <rmk+kernel@arm.linux.org.uk>
 S:     Supported

diff --cc drivers/nfc/Kconfig
Simple merge

diff --cc drivers/nfc/Makefile
Simple merge

diff --cc drivers/nfc/nxp-nci/Kconfig
Simple merge

diff --cc drivers/nfc/nxp-nci/Makefile
Simple merge

diff --cc drivers/nfc/nxp-nci/core.c
Simple merge

diff --cc drivers/nfc/nxp-nci/firmware.c
Simple merge

diff --cc drivers/nfc/nxp-nci/nxp-nci.h
Simple merge

diff --cc include/linux/platform_data/nxp-nci.h
Simple merge