eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm: mvebu: Fix compatible string for nand controller

Browse Source 
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>
This commit is contained in:
Pali Rohár
2022-07-27 14:47:35 +02:00
committed by Stefan Roese
parent 09b0e20d73
commit 204b8707cd
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/armada-370-xp.dtsi
View File

@@ -246,7 +246,7 @@
};
nand@d0000 {
compatible = "marvell,armada370-nand";
compatible = "marvell,armada370-nand-controller";
reg = <0xd0000 0x54>;
#address-cells = <1>;
#size-cells = <1>;

2
arch/arm/dts/armada-375.dtsi
View File

@@ -541,7 +541,7 @@
};
nand@d0000 {
compatible = "marvell,armada370-nand";
compatible = "marvell,armada370-nand-controller";
reg = <0xd0000 0x54>;
#address-cells = <1>;
#size-cells = <1>;

2
arch/arm/dts/armada-38x.dtsi
View File

@@ -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>;

2
arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
View File

@@ -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>;

2
drivers/mtd/nand/raw/pxa3xx_nand.c
View File

@@ -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,
},
{