summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-10-26 10:27:45 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-27 04:24:54 +0100
commitd8e018c0b3211902af1bfb5d5b280f955a4633b7 (patch)
treebd0b2d8b5d75f401e351c473bf63cf9f51f7c6cc /drivers/nfc
parentcaf6e49bf6d02e6bb94df680bbe3beaf680fdefa (diff)
downloadlinux-stable-d8e018c0b3211902af1bfb5d5b280f955a4633b7.tar.gz
linux-stable-d8e018c0b3211902af1bfb5d5b280f955a4633b7.tar.bz2
linux-stable-d8e018c0b3211902af1bfb5d5b280f955a4633b7.zip
NFC: nfcmrvl: update device tree bindings for Marvell NFC
Align NFC bindgins to use marvell instead of mrvl. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/nfcmrvl/i2c.c2
-rw-r--r--drivers/nfc/nfcmrvl/spi.c2
-rw-r--r--drivers/nfc/nfcmrvl/uart.c10
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 7a44025bdaad..78b7aa835c81 100644
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -261,7 +261,7 @@ static int nfcmrvl_i2c_remove(struct i2c_client *client)
static const struct of_device_id of_nfcmrvl_i2c_match[] = {
- { .compatible = "mrvl,nfc-i2c", },
+ { .compatible = "marvell,nfc-i2c", },
{},
};
MODULE_DEVICE_TABLE(of, of_nfcmrvl_i2c_match);
diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
index 358660acd54a..a7faa0bcc01e 100644
--- a/drivers/nfc/nfcmrvl/spi.c
+++ b/drivers/nfc/nfcmrvl/spi.c
@@ -199,7 +199,7 @@ static int nfcmrvl_spi_remove(struct spi_device *spi)
}
static const struct of_device_id of_nfcmrvl_spi_match[] = {
- { .compatible = "mrvl,nfc-spi", },
+ { .compatible = "marvell,nfc-spi", },
{},
};
MODULE_DEVICE_TABLE(of, of_nfcmrvl_spi_match);
diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 4dccee2566cf..f3d041c4f249 100644
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -75,9 +75,13 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
struct device_node *matched_node;
int ret;
- matched_node = of_find_compatible_node(node, NULL, "mrvl,nfc-uart");
- if (!matched_node)
- return -ENODEV;
+ matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart");
+ if (!matched_node) {
+ matched_node = of_find_compatible_node(node, NULL,
+ "mrvl,nfc-uart");
+ if (!matched_node)
+ return -ENODEV;
+ }
ret = nfcmrvl_parse_dt(matched_node, pdata);
if (ret < 0) {