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

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

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



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

"NFC: 3.16: First pull request

This is the NFC pull request for 3.16. We have:

- STMicroeectronics st21nfca support. The st21nfca is an HCI chipset and
  thus relies on the HCI stack. This submission provides support for tag
  redaer/writer mode (including Type 5) and device tree bindings.

- PM runtime support and a bunch of bug fixes for TI's trf7970a.

- Device tree support for NXP's pn544. Legacy platform data support is
  obviously kept intact.

- NFC Tag type 4B support to the NFC Digital stack.

- SOCK_RAW type support to the raw NFC socket, and allow NCI
  sniffing from that. This can be extended to report HCI frames and also
  proprietarry ones like e.g. the pn533 ones."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 96810471 79747280

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

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* NXP Semiconductors PN544 NFC Controller



Required properties:

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

- clock-frequency: IC 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 PN544

- 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 PN544 on I2C2):



&i2c2 {



	status = "okay";



	pn544: pn544@28 {



		compatible = "nxp,pn544-i2c";



		reg = <0x28>;

		clock-frequency = <400000>;



		interrupt-parent = <&gpio1>;

		interrupts = <17 GPIO_ACTIVE_HIGH>;



		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

	};

};

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
* STMicroelectronics SAS. ST21NFCA NFC Controller



Required properties:

- compatible: Should be "st,st21nfca-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 ST21NFCA



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 ST21NFCA on I2C2):



&i2c2 {



	status = "okay";



	st21nfca: st21nfca@1 {



		compatible = "st,st21nfca_i2c";



		reg = <0x01>;

		clock-frequency = <400000>;



		interrupt-parent = <&gpio5>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;



		enable-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;

	};

};

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
Optional SoC Specific Properties:

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

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

- autosuspend-delay: Specify autosuspend delay in milliseconds.



Example (for ARM-based BeagleBone with TRF7970A on SPI1):
@@ -29,6 +30,7 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): 
		ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>,

				  <&gpio2 5 GPIO_ACTIVE_LOW>;

		vin-supply = <&ldo3_reg>;

		autosuspend-delay = <30000>;

		status = "okay";

	};

};

drivers/nfc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,5 +71,6 @@ config NFC_PORT100 
source "drivers/nfc/pn544/Kconfig"

source "drivers/nfc/microread/Kconfig"

source "drivers/nfc/nfcmrvl/Kconfig"

source "drivers/nfc/st21nfca/Kconfig"



endmenu

drivers/nfc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ obj-$(CONFIG_NFC_SIM) += nfcsim.o 
obj-$(CONFIG_NFC_PORT100)	+= port100.o

obj-$(CONFIG_NFC_MRVL)		+= nfcmrvl/

obj-$(CONFIG_NFC_TRF7970A)	+= trf7970a.o

obj-$(CONFIG_NFC_ST21NFCA)  += st21nfca/



ccflags-$(CONFIG_NFC_DEBUG) := -DDEBUG