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>

diff --git a/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt b/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt
index 41058fc..76df917 100644 (file)
--- a/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt
+++ b/Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt
@@ -2,9 +2,9 @@
 
 Required properties:
 - compatible: Should be:
-  - "mrvl,nfc-uart" for UART devices
-  - "mrvl,nfc-i2c" for I2C devices
-  - "mrvl,nfc-spi" for SPI devices
+  - "marvell,nfc-uart" or "mrvl,nfc-uart" for UART devices
+  - "marvell,nfc-i2c" for I2C devices
+  - "marvell,nfc-spi" for SPI devices
 
 Optional SoC specific properties:
 - pinctrl-names: Contains only one value - "default".
@@ -28,7 +28,7 @@ Example (for ARM-based BeagleBoard Black with 88W8887 on UART5):
        status = "okay";
 
        nfcmrvluart: nfcmrvluart@5 {
-               compatible = "mrvl,nfc-uart";
+               compatible = "marvell,nfc-uart";
 
                reset-n-io = <&gpio3 16 0>;
 
@@ -45,7 +45,7 @@ Example (for ARM-based BeagleBoard Black with 88W8887 on I2C1):
        clock-frequency = <400000>;
 
        nfcmrvli2c0: i2c@1 {
-               compatible = "mrvl,nfc-i2c";
+               compatible = "marvell,nfc-i2c";
 
                reg = <0x8>;
 
@@ -67,7 +67,7 @@ Example (for ARM-based BeagleBoard Black on SPI0):
 &spi0 {
 
        mrvlnfcspi0: spi@0 {
-               compatible = "mrvl,nfc-spi";
+               compatible = "marvell,nfc-spi";
 
                reg = <0>;
 

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index 7a44025..78b7aa8 100644 (file)
--- 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 358660a..a7faa0b 100644 (file)
--- 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 4dccee2..f3d041c 100644 (file)
--- 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) {