Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c8cfc2 authored by Lei Wen's avatar Lei Wen Committed by Artem Bityutskiy
Browse files

mtd: pxa3xx_nand: enable multiple chip select support 



Current pxa3xx_nand controller has two chip select which
both be workable. This patch enable this feature.

Update platform driver to support this feature.

Another notice should be taken that:
When you want to use this feature, you should not enable the
keep configuration feature, for two chip select could be
attached with different nand chip. The different page size
and timing requirement make the keep configuration impossible.

Signed-off-by: default avatarLei Wen <leiwen@marvell.com>
parent d456882b

arch/arm/mach-mmp/aspenite.c

+3 −2
Original line number Diff line number Diff line
@@ -167,8 +167,9 @@ static struct mtd_partition aspenite_nand_partitions[] = { 


static struct pxa3xx_nand_platform_data aspenite_nand_info = {

	.enable_arbiter	= 1,

	.parts		= aspenite_nand_partitions,

	.nr_parts	= ARRAY_SIZE(aspenite_nand_partitions),

	.num_cs = 1,

	.parts[0]	= aspenite_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(aspenite_nand_partitions),

};



static struct i2c_board_info aspenite_i2c_info[] __initdata = {

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

+3 −2
Original line number Diff line number Diff line
@@ -424,8 +424,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,

	.parts		= cm_x300_nand_partitions,

	.nr_parts	= ARRAY_SIZE(cm_x300_nand_partitions),

	.num_cs		= 1,

	.parts[0]	= cm_x300_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(cm_x300_nand_partitions),

};



static void __init cm_x300_init_nand(void)

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

+3 −2
Original line number Diff line number Diff line
@@ -139,8 +139,9 @@ static struct mtd_partition colibri_nand_partitions[] = { 
static struct pxa3xx_nand_platform_data colibri_nand_info = {

	.enable_arbiter	= 1,

	.keep_config	= 1,

	.parts		= colibri_nand_partitions,

	.nr_parts	= ARRAY_SIZE(colibri_nand_partitions),

	.num_cs		= 1,

	.parts[0]	= colibri_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(colibri_nand_partitions),

};



void __init colibri_pxa3xx_init_nand(void)

arch/arm/mach-pxa/littleton.c

+3 −2
Original line number Diff line number Diff line
@@ -325,8 +325,9 @@ static struct mtd_partition littleton_nand_partitions[] = { 


static struct pxa3xx_nand_platform_data littleton_nand_info = {

	.enable_arbiter	= 1,

	.parts		= littleton_nand_partitions,

	.nr_parts	= ARRAY_SIZE(littleton_nand_partitions),

	.num_cs		= 1,

	.parts[0]	= littleton_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(littleton_nand_partitions),

};



static void __init littleton_init_nand(void)

arch/arm/mach-pxa/mxm8x10.c

+5 −4
Original line number Diff line number Diff line
@@ -391,8 +391,9 @@ static struct mtd_partition mxm_8x10_nand_partitions[] = { 
static struct pxa3xx_nand_platform_data mxm_8x10_nand_info = {

	.enable_arbiter	= 1,

	.keep_config	= 1,

	.parts = mxm_8x10_nand_partitions,

	.nr_parts = ARRAY_SIZE(mxm_8x10_nand_partitions)

	.num_cs		= 1,

	.parts[0]	= mxm_8x10_nand_partitions,

	.nr_parts[0]	= ARRAY_SIZE(mxm_8x10_nand_partitions)

};



static void __init mxm_8x10_nand_init(void)