evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFC: dts: st21nfca: Fix compatible string spelling to follow other drivers

Browse source 
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>
This commit is contained in:
Christophe Ricard 2014-12-08 22:08:06 +01:00 • committed by Samuel Ortiz
parent 7aee42c676
commit 6b5fba4eb4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/devicetree/bindings/net/nfc/st21nfca.txt
View file

@ -1,7 +1,7 @@
* STMicroelectronics SAS. ST21NFCA NFC Controller * STMicroelectronics SAS. ST21NFCA NFC Controller
Required properties: Required properties:
- compatible: Should be "st,st21nfca_i2c". - compatible: Should be "st,st21nfca-i2c".
- clock-frequency: I²C work frequency. - clock-frequency: I²C work frequency.
- reg: address on the bus - reg: address on the bus
- interrupt-parent: phandle for the interrupt gpio controller - interrupt-parent: phandle for the interrupt gpio controller
@ -20,7 +20,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2):
st21nfca: st21nfca@1 { st21nfca: st21nfca@1 {
compatible = "st,st21nfca_i2c"; compatible = "st,st21nfca-i2c";
reg = <0x01>; reg = <0x01>;
clock-frequency = <400000>; clock-frequency = <400000>;

1
drivers/nfc/st21nfca/i2c.c
View file

@ -661,6 +661,7 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id of_st21nfca_i2c_match[] = { static const struct of_device_id of_st21nfca_i2c_match[] = {
{ .compatible = "st,st21nfca-i2c", },
{ .compatible = "st,st21nfca_i2c", }, { .compatible = "st,st21nfca_i2c", },
{} {}
}; };