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: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt b/Documentation/devicetree/bindings/net/nfc/st-nci.txt
similarity index 87%
rename from Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
rename to Documentation/devicetree/bindings/net/nfc/st-nci.txt
index bb23707..d707588 100644 (file)
--- a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st-nci.txt
@@ -1,7 +1,7 @@
-* 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

diff --cc drivers/nfc/Kconfig
Simple merge

diff --cc drivers/nfc/Makefile
Simple merge

diff --cc drivers/nfc/st-nci/Kconfig
Simple merge

diff --cc drivers/nfc/st-nci/Makefile
Simple merge

diff --cc drivers/nfc/st-nci/core.c
Simple merge

diff --cc drivers/nfc/st-nci/i2c.c
Simple merge

diff --cc drivers/nfc/st-nci/ndlc.c
Simple merge

diff --cc drivers/nfc/st-nci/ndlc.h
Simple merge

diff --cc drivers/nfc/st-nci/st-nci.h
Simple merge

diff --cc drivers/nfc/st-nci/st-nci_se.c
Simple merge

diff --cc drivers/nfc/st-nci/st-nci_se.h
Simple merge

diff --cc drivers/nfc/st21nfcb/Kconfig
Simple merge

diff --cc drivers/nfc/st21nfcb/Makefile
Simple merge

diff --cc drivers/nfc/st21nfcb/st21nfcb.c
Simple merge

diff --cc drivers/nfc/st21nfcb/st21nfcb_se.h
Simple merge

diff --cc include/linux/platform_data/st-nci.h
Simple merge

diff --cc include/linux/platform_data/st_nci.h
Simple merge