Commit 349dfe6c authored by Miquel Raynal's avatar Miquel Raynal Committed by Boris Brezillon
Browse files

mtd: nand: use Marvell reworked NAND controller driver with all platforms 



Compile marvell_nand.c instead of pxa3xx_nand.c with all PXA based SoCs.
Convert all board files and defconfigs so that the new driver is used
everywhere instead of the old one.

Board files using CONFIG_MTD_NAND_PXA3xx now use CONFIG_MTD_NAND_MARVELL
instead.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Tested-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 7928b2cb

arch/arm/configs/cm_x300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/pxa3xx_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_NAND_PXA3xx_BUILTIN=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_GENERIC=y

arch/arm/configs/pxa_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0x4000000 
CONFIG_MTD_NAND_DISKONCHIP_PROBE_HIGH=y

CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE=y

CONFIG_MTD_NAND_SHARPSL=m

CONFIG_MTD_NAND_PXA3xx=m

CONFIG_MTD_NAND_MARVELL=m

CONFIG_MTD_NAND_CM_X270=m

CONFIG_MTD_NAND_TMIO=m

CONFIG_MTD_NAND_BRCMNAND=m

arch/arm/configs/raumfeld_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CONFIG_NFTL=y 
CONFIG_NFTL_RW=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_PXA3xx=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ISL29003=y

arch/arm/mach-mmp/ttc_dkb.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static struct mv_usb_platform_data ttc_usb_pdata = { 
#endif

#endif



#if IS_ENABLED(CONFIG_MTD_NAND_PXA3xx)

#if IS_ENABLED(CONFIG_MTD_NAND_MARVELL)

static struct pxa3xx_nand_platform_data dkb_nand_info = {

	.enable_arbiter = 1,

	.num_cs = 1,
@@ -275,7 +275,7 @@ static void __init ttc_dkb_init(void) 


	/* on-chip devices */

	pxa910_add_uart(1);

#if IS_ENABLED(CONFIG_MTD_NAND_PXA3xx)

#if IS_ENABLED(CONFIG_MTD_NAND_MARVELL)

	pxa910_add_nand(&dkb_nand_info);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE