aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-12-08 16:08:07 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2015-01-25 18:09:22 -0500
commit1a94cb6025d49bb28fd3d639b59e296b19771069 (patch)
tree6de565e23846314551138aa562eaade1b5f24b91
parent6b5fba4eb4267bb8025538f43aac4af51151c890 (diff)
NFC: dts: st21nfcb: 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/st21nfcb.txt4
-rw-r--r--drivers/nfc/st21nfcb/i2c.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
index 9005608cbbd1..bb237072dbe9 100644
--- a/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st21nfcb.txt
@@ -1,7 +1,7 @@
1* STMicroelectronics SAS. ST21NFCB NFC Controller 1* STMicroelectronics SAS. ST21NFCB NFC Controller
2 2
3Required properties: 3Required properties:
4- compatible: Should be "st,st21nfcb_i2c". 4- compatible: Should be "st,st21nfcb-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 ST21NFCB on I2C2):
20 20
21 st21nfcb: st21nfcb@8 { 21 st21nfcb: st21nfcb@8 {
22 22
23 compatible = "st,st21nfcb_i2c"; 23 compatible = "st,st21nfcb-i2c";
24 24
25 reg = <0x08>; 25 reg = <0x08>;
26 clock-frequency = <400000>; 26 clock-frequency = <400000>;
diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index 01ba865863ee..b65847c62631 100644
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -373,6 +373,7 @@ static int st21nfcb_nci_i2c_remove(struct i2c_client *client)
373 373
374#ifdef CONFIG_OF 374#ifdef CONFIG_OF
375static const struct of_device_id of_st21nfcb_i2c_match[] = { 375static const struct of_device_id of_st21nfcb_i2c_match[] = {
376 { .compatible = "st,st21nfcb-i2c", },
376 { .compatible = "st,st21nfcb_i2c", }, 377 { .compatible = "st,st21nfcb_i2c", },
377 {} 378 {}
378}; 379};