nfc: s3fwrn5: Add driver for Samsung S3FWRN5 NFC Chip

Add driver for Samsung S3FWRN5 NFC controller.
S3FWRN5 is using NCI protocol and I2C communication interface.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
new file mode 100644 (file)
index 0000000..fb1e75f
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt
@@ -0,0 +1,27 @@
+* Samsung S3FWRN5 NCI NFC Controller
+
+Required properties:
+- compatible: Should be "samsung,s3fwrn5-i2c".
+- reg: address on the bus
+- interrupt-parent: phandle for the interrupt gpio controller
+- interrupts: GPIO interrupt to which the chip is connected
+- s3fwrn5,en-gpios: Output GPIO pin used for enabling/disabling the chip
+- s3fwrn5,fw-gpios: Output GPIO pin used to enter firmware mode and
+  sleep/wakeup control
+
+Example:
+
+&hsi2c_4 {
+       status = "okay";
+       s3fwrn5@27 {
+               compatible = "samsung,s3fwrn5-i2c";
+
+               reg = <0x27>;
+
+               interrupt-parent = <&gpa1>;
+               interrupts = <3 0 0>;
+
+               s3fwrn5,en-gpios = <&gpf1 4 0>;
+               s3fwrn5,fw-gpios = <&gpj0 2 0>;
+       };
+};

diff --git a/MAINTAINERS b/MAINTAINERS
index ca51eba..7a3b1b9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8871,6 +8871,12 @@ L:       linux-media@vger.kernel.org
 S:     Supported
 F:     drivers/media/i2c/s5k5baf.c
 
+SAMSUNG S3FWRN5 NFC DRIVER
+M:     Robert Baldyga <r.baldyga@samsung.com>
+L:     linux-nfc@lists.01.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/nfc/s3fwrn5
+
 SAMSUNG SOC CLOCK DRIVERS
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 M:     Tomasz Figa <tomasz.figa@gmail.com>

diff --cc drivers/nfc/Kconfig
Simple merge

diff --cc drivers/nfc/Makefile
Simple merge

diff --cc drivers/nfc/s3fwrn5/Kconfig
Simple merge

diff --cc drivers/nfc/s3fwrn5/Makefile
Simple merge

diff --cc drivers/nfc/s3fwrn5/core.c
Simple merge

diff --cc drivers/nfc/s3fwrn5/firmware.c
Simple merge

diff --cc drivers/nfc/s3fwrn5/firmware.h
Simple merge

diff --cc drivers/nfc/s3fwrn5/i2c.c
Simple merge

diff --cc drivers/nfc/s3fwrn5/nci.c
Simple merge

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

diff --cc drivers/nfc/s3fwrn5/s3fwrn5.h
Simple merge