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

Commit ed06aeef authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

nfc: st-nci: Rename st21nfcb to st-nci 



STMicroelectronics NFC NCI chips family is extending
with the new ST21NFCC using the AMS AS39230 RF booster.
The st21nfcb driver is relevant for this solution and
might be with future products.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2df7f8c6

Documentation/devicetree/bindings/net/nfc/st21nfcb.txt→Documentation/devicetree/bindings/net/nfc/st-nci.txt

+2 −2
Original line number Diff line number Diff line 
* STMicroelectronics SAS. ST21NFCB NFC Controller

* STMicroelectronics SAS. ST NCI NFC Controller



Required properties:

- compatible: Should be "st,st21nfcb-i2c".

- compatible: Should be "st,st21nfcb-i2c" or "st,st21nfcc-i2c".

- clock-frequency: I²C work frequency.

- reg: address on the bus

- interrupt-parent: phandle for the interrupt gpio controller

drivers/nfc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -72,6 +72,6 @@ source "drivers/nfc/pn544/Kconfig" 
source "drivers/nfc/microread/Kconfig"

source "drivers/nfc/nfcmrvl/Kconfig"

source "drivers/nfc/st21nfca/Kconfig"

source "drivers/nfc/st21nfcb/Kconfig"

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

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

endmenu

drivers/nfc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ obj-$(CONFIG_NFC_PORT100) += port100.o 
obj-$(CONFIG_NFC_MRVL)		+= nfcmrvl/

obj-$(CONFIG_NFC_TRF7970A)	+= trf7970a.o

obj-$(CONFIG_NFC_ST21NFCA)  	+= st21nfca/

obj-$(CONFIG_NFC_ST21NFCB)	+= st21nfcb/

obj-$(CONFIG_NFC_ST_NCI)	+= st-nci/

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

drivers/nfc/st21nfcb/Kconfig→drivers/nfc/st-nci/Kconfig

+23 −0
Original line number Diff line number Diff line 
config NFC_ST21NFCB

	tristate "STMicroelectronics ST21NFCB NFC driver"

config NFC_ST_NCI

	tristate "STMicroelectronics ST NCI NFC driver"

	depends on NFC_NCI

	default n

	---help---

	  STMicroelectronics ST21NFCB core driver. It implements the chipset

	  STMicroelectronics NFC NCI chips core driver. It implements the chipset

	  NCI logic and hooks into the NFC kernel APIs. Physical layers will

	  register against it.



	  To compile this driver as a module, choose m here. The module will

	  be called st21nfcb.

	  be called st-nci.

	  Say N if unsure.



config NFC_ST21NFCB_I2C

	tristate "NFC ST21NFCB i2c support"

	depends on NFC_ST21NFCB && I2C

config NFC_ST_NCI_I2C

	tristate "NFC ST NCI i2c support"

	depends on NFC_ST_NCI && I2C

	---help---

	  This module adds support for the STMicroelectronics st21nfcb i2c interface.

	  This module adds support for an I2C interface to the

	  STMicroelectronics NFC NCI chips familly.

	  Select this if your platform is using the i2c bus.



	  If you choose to build a module, it'll be called st21nfcb_i2c.

	  If you choose to build a module, it'll be called st-nci_i2c.

	  Say N if unsure.

drivers/nfc/st-nci/Makefile

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# Makefile for ST21NFCB NCI based NFC driver

#



st-nci-objs = ndlc.o core.o st-nci_se.o

obj-$(CONFIG_NFC_ST_NCI)     += st-nci.o



st-nci_i2c-objs = i2c.o

obj-$(CONFIG_NFC_ST_NCI_I2C) += st-nci_i2c.o