@@ -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" 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>;
@@ -273,7 +273,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);
@@ -213,7 +213,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);
@@ -75,7 +75,7 @@ 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");
+ matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart");
if (!matched_node)
return -ENODEV;
Align NFC bindgins to use marvell instead of mrvl. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> --- Documentation/devicetree/bindings/net/nfc/nfcmrvl.txt | 12 ++++++------ drivers/nfc/nfcmrvl/i2c.c | 2 +- drivers/nfc/nfcmrvl/spi.c | 2 +- drivers/nfc/nfcmrvl/uart.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)