Commit ec665fac authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'nfc-next-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next 



Samuel Ortiz <sameo@linux.intel.com> says:

"This is the first NFC pull request for 3.14

It includes:

* A new NFC driver for Marvell's 8897, and a few NCI fixes and
  improvements needed to support this chipset.

* An LLCP fix for how we were setting the default MIU on a p2p link. If
  there is no explicit MIU extension announced at connection time, we
  must use the default one and not the one announced at LLCP link
  establishement time.

* A pn544 EEPROM config update. Some of the currently EEPROM configured
  values are overwriting the firmware ones while other should not be set
  by the driver itself.

* Some NFC digital stack fixes and improvements. Asynchronous functions
  are better documented, RF technologies and CRC functions are set upon
  PSL_REQ reception, and a few minor bugs are fixed.

* Minor and miscelaneous pn533, mei_phy and port100 fixes."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 1e2f9295 bb55dc2a

drivers/nfc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ config NFC_PORT100 


source "drivers/nfc/pn544/Kconfig"

source "drivers/nfc/microread/Kconfig"

source "drivers/nfc/nfcmrvl/Kconfig"



endmenu

drivers/nfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ obj-$(CONFIG_NFC_WILINK) += nfcwilink.o 
obj-$(CONFIG_NFC_MEI_PHY)	+= mei_phy.o

obj-$(CONFIG_NFC_SIM)		+= nfcsim.o

obj-$(CONFIG_NFC_PORT100)	+= port100.o

obj-$(CONFIG_NFC_MRVL)		+= nfcmrvl/



ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG

drivers/nfc/mei_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void nfc_mei_event_cb(struct mei_cl_device *device, u32 events, void *context) 


		reply_size = mei_cl_recv(device, skb->data, MEI_NFC_MAX_READ);

		if (reply_size < MEI_NFC_HEADER_SIZE) {

			kfree(skb);

			kfree_skb(skb);

			return;

		}

drivers/nfc/nfcmrvl/Kconfig

0 → 100644
+23 −0
Original line number Diff line number Diff line 
config NFC_MRVL

	tristate "Marvell NFC driver support"

	depends on NFC_NCI

	help

	  The core driver to support Marvell NFC devices.



	  This driver is required if you want to support

	  Marvell NFC device 8897.



	  Say Y here to compile Marvell NFC driver into the kernel or

	  say M to compile it as module.



config NFC_MRVL_USB

	tristate "Marvell NFC-over-USB driver"

	depends on NFC_MRVL && USB

	help

	  Marvell NFC-over-USB driver.



	  This driver provides support for Marvell NFC-over-USB devices:

          8897.



	  Say Y here to compile support for Marvell NFC-over-USB driver

	  into the kernel or say M to compile it as module.

drivers/nfc/nfcmrvl/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Makefile for NFCMRVL NCI based NFC driver

#



nfcmrvl-y += main.o

obj-$(CONFIG_NFC_MRVL) += nfcmrvl.o



nfcmrvl_usb-y += usb.o

obj-$(CONFIG_NFC_MRVL_USB) += nfcmrvl_usb.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE