diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-23 20:42:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-23 20:42:57 -0700 |
commit | d9893d1351e11f565940df6cd6f9bf13aac27a3a (patch) | |
tree | dfe753af88000e38fac4c3e59b5d39dd32338feb /drivers/nfc/s3fwrn5/Kconfig | |
parent | route: fix breakage after moving lwtunnel state (diff) | |
parent | nfc: netlink: Add capability to reply to vendor_cmd with data (diff) | |
download | linux-dev-d9893d1351e11f565940df6cd6f9bf13aac27a3a.tar.xz linux-dev-d9893d1351e11f565940df6cd6f9bf13aac27a3a.zip |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nfc/s3fwrn5/Kconfig')
-rw-r--r-- | drivers/nfc/s3fwrn5/Kconfig | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/nfc/s3fwrn5/Kconfig b/drivers/nfc/s3fwrn5/Kconfig new file mode 100644 index 000000000000..7e3b255b3f99 --- /dev/null +++ b/drivers/nfc/s3fwrn5/Kconfig @@ -0,0 +1,19 @@ +config NFC_S3FWRN5 + tristate + ---help--- + Core driver for Samsung S3FWRN5 NFC chip. Contains core utilities + of chip. It's intended to be used by PHYs to avoid duplicating lots + of common code. + +config NFC_S3FWRN5_I2C + tristate "Samsung S3FWRN5 I2C support" + depends on NFC_NCI && I2C + select NFC_S3FWRN5 + default n + ---help--- + This module adds support for an I2C interface to the S3FWRN5 chip. + Select this if your platform is using the I2C bus. + + To compile this driver as a module, choose m here. The module will + be called s3fwrn5_i2c.ko. + Say N if unsure. |