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

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

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



Samuel Ortiz says:

====================
NFC 4.12 pull request

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

- Improvements for the pn533 command queue handling and device
  registration order.
- Removal of platform data for the pn544 and st21nfca drivers.
- Additional device tree options to support more trf7970a hardware options.
- Support for Sony's RC-S380P through the port100 driver.
- Removal of the obsolte nfcwilink driver.
- Headers inclusion cleanups (miscdevice.h, unaligned.h) for many drivers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ea8ffc08 4ea20639

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

+6 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ Required properties: 
- spi-max-frequency: Maximum SPI frequency (<= 2000000).

- interrupt-parent: phandle of parent interrupt handler.

- interrupts: A single interrupt specifier.

- ti,enable-gpios: Two GPIO entries used for 'EN' and 'EN2' pins on the

  TRF7970A.

- ti,enable-gpios: One or two GPIO entries used for 'EN' and 'EN2' pins on the

  TRF7970A. EN2 is optional.

- vin-supply: Regulator for supply voltage to VIN pin



Optional SoC Specific Properties:
@@ -21,6 +21,8 @@ Optional SoC Specific Properties: 
- t5t-rmb-extra-byte-quirk: Specify that the trf7970a has the erratum

  where an extra byte is returned by Read Multiple Block commands issued

  to Type 5 tags.

- vdd-io-supply: Regulator specifying voltage for vdd-io

- clock-frequency: Set to specify that the input frequency to the trf7970a is 13560000Hz or 27120000Hz



Example (for ARM-based BeagleBone with TRF7970A on SPI1):
@@ -39,10 +41,12 @@ Example (for ARM-based BeagleBone with TRF7970A on SPI1): 
				  <&gpio2 5 GPIO_ACTIVE_LOW>;

		vin-supply = <&ldo3_reg>;

		vin-voltage-override = <5000000>;

		vdd-io-supply = <&ldo2_reg>;

		autosuspend-delay = <30000>;

		irq-status-read-quirk;

		en2-rf-quirk;

		t5t-rmb-extra-byte-quirk;

		clock-frequency = <27120000>;

		status = "okay";

	};

};

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -8876,8 +8876,6 @@ S: Supported 
F:	drivers/net/ethernet/qlogic/netxen/



NFC SUBSYSTEM

M:	Lauro Ramos Venancio <lauro.venancio@openbossa.org>

M:	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>

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

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (subscribers-only)

drivers/nfc/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -5,17 +5,6 @@ 
menu "Near Field Communication (NFC) devices"

	depends on NFC



config NFC_WILINK

	tristate "Texas Instruments NFC WiLink driver"

	depends on TI_ST && NFC_NCI

	help

	  This enables the NFC driver for Texas Instrument's BT/FM/GPS/NFC

	  combo devices. This makes use of shared transport line discipline

	  core driver to communicate with the NFC core of the combo chip.



	  Say Y here to compile support for Texas Instrument's NFC WiLink driver

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



config NFC_TRF7970A

	tristate "Texas Instruments TRF7970a NFC driver"

	depends on SPI && NFC_DIGITAL

drivers/nfc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ obj-$(CONFIG_NFC_FDP) += fdp/ 
obj-$(CONFIG_NFC_PN544)		+= pn544/

obj-$(CONFIG_NFC_MICROREAD)	+= microread/

obj-$(CONFIG_NFC_PN533)		+= pn533/

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

drivers/nfc/fdp/i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -210,14 +210,14 @@ static irqreturn_t fdp_nci_i2c_irq_thread_fn(int irq, void *phy_id) 
	struct sk_buff *skb;

	int r;



	client = phy->i2c_dev;

	dev_dbg(&client->dev, "%s\n", __func__);



	if (!phy || irq != phy->i2c_dev->irq) {

		WARN_ON_ONCE(1);

		return IRQ_NONE;

	}



	client = phy->i2c_dev;

	dev_dbg(&client->dev, "%s\n", __func__);



	r = fdp_nci_i2c_read(phy, &skb);



	if (r == -EREMOTEIO)