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

Commit 74218fed authored by Ben Dooks's avatar Ben Dooks Committed by David Woodhouse
Browse files

mtd: s3c2410: propagate nand options from the platform data 



Update the nand information passed to the core from the platform data to
setup the initial option value, so that flags such as NAND_SCAN_SILENT_NODEV
can pass through.

Signed-off-by: default avatarBen Dooks <ben@simtec.co.uk>
Signed-off-by: default avatarSimtec Linux Team <linux@simtec.co.uk>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b1c6e6db

arch/arm/plat-s3c/include/plat/nand.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *			Setting this flag will allow the kernel to

 *			look for it at boot time and also skip the NAND

 *			scan.

 * @options:		Default value to set into 'struct nand_chip' options.

 * @nr_chips:		Number of chips in this set

 * @nr_partitions:	Number of partitions pointed to by @partitions

 * @name:		Name of set (optional)
@@ -31,6 +32,7 @@ struct s3c2410_nand_set { 
	unsigned int		disable_ecc:1;

	unsigned int		flash_bbt:1;



	unsigned int		options;

	int			nr_chips;

	int			nr_partitions;

	char			*name;

drivers/mtd/nand/s3c2410.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info, 
	chip->select_chip  = s3c2410_nand_select_chip;

	chip->chip_delay   = 50;

	chip->priv	   = nmtd;

	chip->options	   = 0;

	chip->options	   = set->options;

	chip->controller   = &info->controller;



	switch (info->cpu_type) {