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>

diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h
index 18f958801e64c16957d26ac9a1a41da39bf72e9e..afd1673ad0eceb0852169f471f738242e2dade42 100644 (file)
--- 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 11dc7e69c4fb51d1a0cd801efa7982aecde91b49..6e88bd3c02f533948be6b39aaf3bfc9acdb72f41 100644 (file)
--- 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) {