Marvell PXA3xx and Armada 370/XP share the same NAND controller IP
with some minor differences. With support for controller IP v2, now
allow to build the driver on Armada 370/XP.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx>
Acked-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
Tested-by: Robert Jarzmik <robert.jarzmik@xxxxxxx>
---
drivers/mtd/nand/Kconfig | 7 ++++---
drivers/mtd/nand/nand_mrvl_nfc.c | 8 ++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 3426ec055756..2b4a478a03dd 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -99,10 +99,11 @@ config NAND_ORION
config NAND_MRVL_NFC
bool
- prompt "Marvell NAND driver"
- depends on ARCH_PXA3XX
+ prompt "Marvell PXA3xx NAND driver"
+ depends on ARCH_ARMADA_370 || ARCH_ARMADA_XP || ARCH_PXA3XX
help
- Support for the PXA3xx NAND controller, present in pxa3xx SoCs.
+ Support for the PXA3xx NAND controller, present in Armada 370/XP and
+ PXA3xx SoCs.
config NAND_ATMEL
bool
diff --git a/drivers/mtd/nand/nand_mrvl_nfc.c b/drivers/mtd/nand/nand_mrvl_nfc.c
index fec18d1fc95a..ce5786c01920 100644
--- a/drivers/mtd/nand/nand_mrvl_nfc.c
+++ b/drivers/mtd/nand/nand_mrvl_nfc.c
@@ -285,11 +285,19 @@ static const struct mrvl_nand_variant pxa3xx_variant = {
.hwflags = 0,
};
+static const struct mrvl_nand_variant armada370_variant = {
+ .hwflags = HWFLAGS_ECC_BCH | HWFLAGS_HAS_NDCB3,
+};
+
static struct of_device_id mrvl_nand_dt_ids[] = {
{
.compatible = "marvell,pxa3xx-nand",
.data = &pxa3xx_variant,
},
+ {
+ .compatible = "marvell,armada370-nand",
+ .data = &armada370_variant,
+ },
{}
};
--
2.1.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
