| From e3340a906f20577986a2c70fe7624a4100bdd602 Mon Sep 17 00:00:00 2001 |
| From: Miquel Raynal <miquel.raynal@free-electrons.com> |
| Date: Tue, 9 Jan 2018 11:36:34 +0100 |
| Subject: [PATCH 0651/1795] mtd: nand: use reworked NAND controller driver with |
| Marvell EBU SoCs |
| |
| Choose to compile and embed marvell_nand.c as NAND controller driver |
| instead of the legacy pxa3xx_nand.c for platforms with Marvell EBU |
| SoCs. |
| |
| Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com> |
| Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> |
| (cherry picked from commit dd533734395f0e14db12d82fc64a879c805743dd) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/configs/mvebu_v7_defconfig | 2 +- |
| arch/arm64/configs/defconfig | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig |
| index 69553704f2dc..4b6e4fd47e5d 100644 |
| --- a/arch/arm/configs/mvebu_v7_defconfig |
| +++ b/arch/arm/configs/mvebu_v7_defconfig |
| @@ -57,7 +57,7 @@ CONFIG_MTD_CFI_STAA=y |
| CONFIG_MTD_PHYSMAP_OF=y |
| CONFIG_MTD_M25P80=y |
| CONFIG_MTD_NAND=y |
| -CONFIG_MTD_NAND_PXA3xx=y |
| +CONFIG_MTD_NAND_MARVELL=y |
| CONFIG_MTD_SPI_NOR=y |
| CONFIG_SRAM=y |
| CONFIG_MTD_UBI=y |
| diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig |
| index 49509f18585c..aa15c8ab8c95 100644 |
| --- a/arch/arm64/configs/defconfig |
| +++ b/arch/arm64/configs/defconfig |
| @@ -162,7 +162,7 @@ CONFIG_MTD_BLOCK=y |
| CONFIG_MTD_M25P80=y |
| CONFIG_MTD_NAND=y |
| CONFIG_MTD_NAND_DENALI_DT=y |
| -CONFIG_MTD_NAND_PXA3xx=y |
| +CONFIG_MTD_NAND_MARVELL=y |
| CONFIG_MTD_SPI_NOR=y |
| CONFIG_BLK_DEV_LOOP=y |
| CONFIG_BLK_DEV_NBD=m |
| -- |
| 2.19.0 |
| |
