Commit 7576594c authored by Miquel Raynal's avatar Miquel Raynal Committed by Boris Brezillon
Browse files

mtd: nand: remove useless fields from pxa3xx NAND platform data 



The "enable arbiter" bit is available only for pxa3xx based platforms
but it was experimentally shown that even if this bit is reserved,
some Marvell platforms (64-bit) actually need it to be set. The driver
always set this bit regardless of this property, which is harmless.
Then this property is not needed.

The "num_cs" field is always 1 and for a good reason, the old driver
(pxa3xx_nand.c) could only handle one. The new driver that replaces it
(marvell_nand.c) can handle more, but better use device tree for such
description. As there is only one available chip select, there is no
need for an array of partitions neither an array of partition numbers.

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

arch/arm/mach-mmp/aspenite.c

+2 −4
Original line number Diff line number Diff line
@@ -172,10 +172,8 @@ static struct mtd_partition aspenite_nand_partitions[] = { 
};



static struct pxa3xx_nand_platform_data aspenite_nand_info = {

	.enable_arbiter	= 1,

	.num_cs = 1,

	.parts[0]	= aspenite_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(aspenite_nand_partitions),

	.parts		= aspenite_nand_partitions,

	.nr_parts	= ARRAY_SIZE(aspenite_nand_partitions),

};



static struct i2c_board_info aspenite_i2c_info[] __initdata = {

arch/arm/mach-mmp/ttc_dkb.c

+1 −4
Original line number Diff line number Diff line
@@ -179,10 +179,7 @@ static struct mv_usb_platform_data ttc_usb_pdata = { 
#endif



#if IS_ENABLED(CONFIG_MTD_NAND_MARVELL)

static struct pxa3xx_nand_platform_data dkb_nand_info = {

	.enable_arbiter = 1,

	.num_cs = 1,

};

static struct pxa3xx_nand_platform_data dkb_nand_info = {};

#endif



#if IS_ENABLED(CONFIG_MMP_DISP)

arch/arm/mach-pxa/cm-x300.c

+2 −4
Original line number Diff line number Diff line
@@ -429,11 +429,9 @@ static struct mtd_partition cm_x300_nand_partitions[] = { 
};



static struct pxa3xx_nand_platform_data cm_x300_nand_info = {

	.enable_arbiter	= 1,

	.keep_config	= 1,

	.num_cs		= 1,

	.parts[0]	= cm_x300_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(cm_x300_nand_partitions),

	.parts		= cm_x300_nand_partitions,

	.nr_parts	= ARRAY_SIZE(cm_x300_nand_partitions),

};



static void __init cm_x300_init_nand(void)

arch/arm/mach-pxa/colibri-pxa3xx.c

+2 −4
Original line number Diff line number Diff line
@@ -138,11 +138,9 @@ static struct mtd_partition colibri_nand_partitions[] = { 
};



static struct pxa3xx_nand_platform_data colibri_nand_info = {

	.enable_arbiter	= 1,

	.keep_config	= 1,

	.num_cs		= 1,

	.parts[0]	= colibri_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(colibri_nand_partitions),

	.parts		= colibri_nand_partitions,

	.nr_parts	= ARRAY_SIZE(colibri_nand_partitions),

};



void __init colibri_pxa3xx_init_nand(void)

arch/arm/mach-pxa/littleton.c

+2 −4
Original line number Diff line number Diff line
@@ -329,10 +329,8 @@ static struct mtd_partition littleton_nand_partitions[] = { 
};



static struct pxa3xx_nand_platform_data littleton_nand_info = {

	.enable_arbiter	= 1,

	.num_cs		= 1,

	.parts[0]	= littleton_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(littleton_nand_partitions),

	.parts		= littleton_nand_partitions,

	.nr_parts	= ARRAY_SIZE(littleton_nand_partitions),

};



static void __init littleton_init_nand(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE