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>

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) {