diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2015-11-20 20:36:11 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-23 08:17:25 +0100 |
| commit | 131d5b5aef5bd643bd25f07a3765555ed565fb6d (patch) | |
| tree | 41f74a8ce23c7d4a89eaa723ba34f57e7c23f08a | |
| parent | 7c6e711ef8b87099339af6866d6f63449a5cb987 (diff) | |
| download | barebox-131d5b5aef5bd643bd25f07a3765555ed565fb6d.tar.gz barebox-131d5b5aef5bd643bd25f07a3765555ed565fb6d.tar.xz | |
mtd: nand_mrvl_nfc: Add support for Marvell Armada 370/XP
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@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 7 | ||||
| -rw-r--r-- | 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 3426ec0557..2b4a478a03 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 35a2f64492..bd86ca7fb2 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, + }, {} }; |