aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-12-08 16:08:06 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2015-01-25 18:09:22 -0500
commit6b5fba4eb4267bb8025538f43aac4af51151c890 (patch)
tree8dd9b5838cb2e15189d6922c68a01a9664f540ad
parent7aee42c6764bae75d0eb2f674f0874193de90c05 (diff)
NFC: dts: st21nfca: Fix compatible string spelling to follow other drivers
Other drivers are following the following compatible string format for dts: s/_/-/ Because some devices may still use the previous string, the new corrected string is added to the of_device_id table. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--Documentation/devicetree/bindings/net/nfc/st21nfca.txt4
-rw-r--r--drivers/nfc/st21nfca/i2c.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
index e4faa2e8dfeb..db677fef56a9 100644
--- a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt
@@ -1,7 +1,7 @@
1* STMicroelectronics SAS. ST21NFCA NFC Controller 1* STMicroelectronics SAS. ST21NFCA NFC Controller
2 2
3Required properties: 3Required properties:
4- compatible: Should be "st,st21nfca_i2c". 4- compatible: Should be "st,st21nfca-i2c".
5- clock-frequency: I²C work frequency. 5- clock-frequency: I²C work frequency.
6- reg: address on the bus 6- reg: address on the bus
7- interrupt-parent: phandle for the interrupt gpio controller 7- interrupt-parent: phandle for the interrupt gpio controller
@@ -20,7 +20,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2):
20 20
21 st21nfca: st21nfca@1 { 21 st21nfca: st21nfca@1 {
22 22
23 compatible = "st,st21nfca_i2c"; 23 compatible = "st,st21nfca-i2c";
24 24
25 reg = <0x01>; 25 reg = <0x01>;
26 clock-frequency = <400000>; 26 clock-frequency = <400000>;
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index 05722085a59f..b2e0792a38a0 100644
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -661,6 +661,7 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client)
661 661
662#ifdef CONFIG_OF 662#ifdef CONFIG_OF
663static const struct of_device_id of_st21nfca_i2c_match[] = { 663static const struct of_device_id of_st21nfca_i2c_match[] = {
664 { .compatible = "st,st21nfca-i2c", },
664 { .compatible = "st,st21nfca_i2c", }, 665 { .compatible = "st,st21nfca_i2c", },
665 {} 666 {}
666}; 667};