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

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

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



Samuel Ortiz says:

====================
NFC 4.3 pull request

This is the NFC pull request for 4.3.
With this one we have:

- A new driver for Samsung's S3FWRN5 NFC chipset. In order to
  properly support this driver, a few NCI core routines needed
  to be exported. Future drivers like Intel's Fields Peak will
  benefit from this.

- SPI support as a physical transport for STM st21nfcb.

- An additional netlink API for sending replies back to userspace
  from vendor commands.

- 2 small fixes for TI's trf7970a

- A few st-nci fixes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 751a587a 29e76924

Documentation/devicetree/bindings/net/nfc/s3fwrn5.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* 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>;

	};

};

Documentation/devicetree/bindings/net/nfc/st-nci-spi.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
* STMicroelectronics SAS. ST NCI NFC Controller



Required properties:

- compatible: Should be "st,st21nfcb-spi"

- spi-max-frequency: Maximum SPI frequency (<= 10000000).

- interrupt-parent: phandle for the interrupt gpio controller

- interrupts: GPIO interrupt to which the chip is connected

- reset-gpios: Output GPIO pin used to reset the ST21NFCB



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 BeagleBoard xM with ST21NFCB on SPI4):



&mcspi4 {



	status = "okay";



	st21nfcb: st21nfcb@0 {



		compatible = "st,st21nfcb-spi";



		clock-frequency = <4000000>;



		interrupt-parent = <&gpio5>;

		interrupts = <2 IRQ_TYPE_EDGE_RISING>;



		reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;

	};

};

MAINTAINERS

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

drivers/nfc/Kconfig

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

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

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

source "drivers/nfc/s3fwrn5/Kconfig"

endmenu