arm: mvebu: Fix compatible string for nand controller

Linux kernel uses compatible string "marvell,armada370-nand-controller" for
nand controllers on Armada 370/XP/38x. U-Boot currently uses mix of
"marvell,armada370-nand" and "marvell,mvebu-pxa3xx-nand".

So unify it and use just Linux kernel compatible string.

Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi
index 50fc0be9f73bccf5d079f548f42a8911a2458476..4cd168c95784556102a92b7bbc3752a962f1c88d 100644 (file)
--- a/arch/arm/dts/armada-370-xp.dtsi
+++ b/arch/arm/dts/armada-370-xp.dtsi
@@ -246,7 +246,7 @@
                        };
 
                        nand@d0000 {
-                               compatible = "marvell,armada370-nand";
+                               compatible = "marvell,armada370-nand-controller";
                                reg = <0xd0000 0x54>;
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm/dts/armada-375.dtsi b/arch/arm/dts/armada-375.dtsi
index ff0ad7a9c7fd8bfb8b9afd4607d40ab67d33ec68..fcb9245fd4967fd9cbb3e997ccd4f14268638051 100644 (file)
--- a/arch/arm/dts/armada-375.dtsi
+++ b/arch/arm/dts/armada-375.dtsi
@@ -541,7 +541,7 @@
                        };
 
                        nand@d0000 {
-                               compatible = "marvell,armada370-nand";
+                               compatible = "marvell,armada370-nand-controller";
                                reg = <0xd0000 0x54>;
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi
index 7d76df3f9ce71a857a42a7d1e179ad0b2d4def73..2845b010be7d508e85c84e6da0913301af6c762f 100644 (file)
--- a/arch/arm/dts/armada-38x.dtsi
+++ b/arch/arm/dts/armada-38x.dtsi
@@ -557,7 +557,7 @@
                        };
 
                        nand_controller: nand-controller@d0000 {
-                               compatible = "marvell,armada370-nand","marvell,mvebu-pxa3xx-nand";
+                               compatible = "marvell,armada370-nand-controller";
                                reg = <0xd0000 0x54>;
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --git a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
index 90cad85506d0acbeb7b164526ae9545bce545280..fdbe168a8734d849abd360b129b9bbf6637613c8 100644 (file)
--- a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
+++ b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
@@ -5,7 +5,7 @@
 };
 
 &nand_controller {
-       compatible="marvell,mvebu-pxa3xx-nand";
+       compatible="marvell,armada370-nand-controller";
        status = "okay";
        label = "pxa3xx_nand-0";
        nand-rb = <0>;

diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 20d1aee7b3e15b3befcdec51a1c7cf03d32e8ae0..9c29e8a6c2149d37d449f8389165a0901e79cd1e 100644 (file)
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -429,7 +429,7 @@ static struct nand_ecclayout ecc_layout_8KB_bch8bit = {
 
 static const struct udevice_id pxa3xx_nand_dt_ids[] = {
        {
-               .compatible = "marvell,mvebu-pxa3xx-nand",
+               .compatible = "marvell,armada370-nand-controller",
                .data = PXA3XX_NAND_VARIANT_ARMADA370,
        },
        {