Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82740b9a authored by David S. Miller's avatar David S. Miller
Browse files

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



Samuel Ortiz says:

====================
NFC: 4.1 pull request

This is the NFC pull request for 4.1.

This is a shorter one than usual, as the Intel Field Peak NFC
driver could not make it in time.

We have:

- A new driver for NXP NCI based chipsets, like e.g. the NPC100 or
  the PN7150. It currently only supports an i2c physical layer, but
  could easily be extended to work on top of e.g. SPI.
  This driver also includes support for user space triggered firmware
  updates.

- A few minor st21nfc[ab] fixes, cleanups, and comments improvements.

- A pn533 error return fix.

- A few NFC related logs formatting cleanups.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 51df60f5 3590ebc0

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* NXP Semiconductors NXP NCI NFC Controllers



Required properties:

- compatible: Should be "nxp,nxp-nci-i2c".

- clock-frequency: I²C work frequency.

- reg: address on the bus

- interrupt-parent: phandle for the interrupt gpio controller

- interrupts: GPIO interrupt to which the chip is connected

- enable-gpios: Output GPIO pin used for enabling/disabling the chip

- firmware-gpios: Output GPIO pin used to enter firmware download mode



Optional SoC Specific Properties:

- pinctrl-names: Contains only one value - "default".

- pintctrl-0: Specifies the pin control groups used for this controller.



Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2):



&i2c2 {



	status = "okay";



	npc100: npc100@29 {



		compatible = "nxp,nxp-nci-i2c";



		reg = <0x29>;

		clock-frequency = <100000>;



		interrupt-parent = <&gpio1>;

		interrupts = <29 GPIO_ACTIVE_HIGH>;



		enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

	};

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6944,6 +6944,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

drivers/nfc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,4 +73,5 @@ source "drivers/nfc/microread/Kconfig" 
source "drivers/nfc/nfcmrvl/Kconfig"

source "drivers/nfc/st21nfca/Kconfig"

source "drivers/nfc/st21nfcb/Kconfig"

source "drivers/nfc/nxp-nci/Kconfig"

endmenu

drivers/nfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ obj-$(CONFIG_NFC_MRVL) += nfcmrvl/ 
obj-$(CONFIG_NFC_TRF7970A)	+= trf7970a.o

obj-$(CONFIG_NFC_ST21NFCA)  	+= st21nfca/

obj-$(CONFIG_NFC_ST21NFCB)	+= st21nfcb/

obj-$(CONFIG_NFC_NXP_NCI)	+= nxp-nci/



ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG

drivers/nfc/microread/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int microread_i2c_probe(struct i2c_client *client, 
	if (r < 0)

		goto err_irq;



	nfc_info(&client->dev, "Probed");

	nfc_info(&client->dev, "Probed\n");



	return 0;