diff options
| author |   Christophe Ricard <christophe.ricard@gmail.com> | 2014-12-08 22:08:07 +0100 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2015-01-26 00:09:22 +0100 |
| commit | 1a94cb6025d49bb28fd3d639b59e296b19771069 (patch) | |
| tree | 6de565e23846314551138aa562eaade1b5f24b91 | |
| parent | NFC: dts: st21nfca: Fix compatible string spelling to follow other drivers (diff) | |
| download | linux-dev-1a94cb6025d49bb28fd3d639b59e296b19771069.tar.xz linux-dev-1a94cb6025d49bb28fd3d639b59e296b19771069.zip | |
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.txt | 4 | ||||
| -rw-r--r-- | drivers/nfc/st21nfcb/i2c.c | 1 |
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 @@ * STMicroelectronics SAS. ST21NFCB NFC Controller Required properties: -- compatible: Should be "st,st21nfcb_i2c". +- compatible: Should be "st,st21nfcb-i2c". - clock-frequency: I²C work frequency. - reg: address on the bus - interrupt-parent: phandle for the interrupt gpio controller @@ -20,7 +20,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2): st21nfcb: st21nfcb@8 { - compatible = "st,st21nfcb_i2c"; + compatible = "st,st21nfcb-i2c"; reg = <0x08>; 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) #ifdef CONFIG_OF static const struct of_device_id of_st21nfcb_i2c_match[] = { + { .compatible = "st,st21nfcb-i2c", }, { .compatible = "st,st21nfcb_i2c", }, {} }; |