diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 3426ec055..2b4a478a0 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 35a2f6449..bd86ca7fb 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, + }, {} };