diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-11-02 18:12:51 +0000 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-11-30 09:49:28 +0000 |
| commit | 74218fedf478323cce831b51507eebd1faf0bf7f (patch) | |
| tree | 250831fbd3d1bd09c3aea810476bdce466b0d889 | |
| parent | b1c6e6db5bb7acad82e1c64914c6a9404dae3ee1 (diff) | |
| download | kernel_samsung_aries-74218fedf478323cce831b51507eebd1faf0bf7f.zip kernel_samsung_aries-74218fedf478323cce831b51507eebd1faf0bf7f.tar.gz kernel_samsung_aries-74218fedf478323cce831b51507eebd1faf0bf7f.tar.bz2 | |
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: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/nand.h | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h index 18f9588..afd1673 100644 --- a/arch/arm/plat-s3c/include/plat/nand.h +++ b/arch/arm/plat-s3c/include/plat/nand.h @@ -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; diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 11dc7e6..6e88bd3 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -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) { |