---

yaml --- r: 306698 b: refs/heads/master c: bbed0de h: refs/heads/master v: v3
git-mirror · May 15, 2012 · 6960661 · 6960661
1 parent b465cbf
commit 6960661
Show file tree

Hide file tree

Showing 5 changed files with 969 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5fe4cf8ee2bf15c0f44f9eba06147cdddbddf6d
+refs/heads/master: bbed0deefbb4bb1ab09e0dbc29e00fda86bb7838
diff --git a/trunk/drivers/nfc/Kconfig b/trunk/drivers/nfc/Kconfig
@@ -17,6 +17,19 @@ config PN544_NFC
 	  To compile this driver as a module, choose m here. The module will
 	  be called pn544.
 
+config PN544_HCI_NFC
+	tristate "HCI PN544 NFC driver"
+	depends on I2C && NFC_SHDLC
+	select CRC_CCITT
+	default n
+	---help---
+	  NXP PN544 i2c driver.
+	  This is a driver based on the SHDLC and HCI NFC kernel layers and
+	  will thus not work with NXP libnfc library.
+
+	  To compile this driver as a module, choose m here. The module will
+	  be called pn544_hci.
+
 config NFC_PN533
 	tristate "NXP PN533 USB driver"
 	depends on USB

diff --git a/trunk/drivers/nfc/Makefile b/trunk/drivers/nfc/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_PN544_NFC)		+= pn544.o
+obj-$(CONFIG_PN544_HCI_NFC)	+= pn544_hci.o
 obj-$(CONFIG_NFC_PN533)		+= pn533.o
 obj-$(CONFIG_NFC_WILINK)	+= nfcwilink.o