From patchwork Mon Nov 2 18:12:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: s3c2410: propogate nand options from the platform data Date: Mon, 02 Nov 2009 08:12:51 -0000 From: Ben Dooks X-Patchwork-Id: 37445 Message-Id: <20091102181251.730102058@fluff.org.uk> To: linux-mtd@lists.infradead.org, dwmw2@infradead.org Cc: Simtec Linux Team 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 Signed-off-by: Simtec Linux Team --- arch/arm/plat-s3c/include/plat/nand.h | 2 ++ drivers/mtd/nand/s3c2410.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) Index: b/arch/arm/plat-s3c/include/plat/nand.h =================================================================== --- a/arch/arm/plat-s3c/include/plat/nand.h 2009-11-02 17:37:01.000000000 +0000 +++ b/arch/arm/plat-s3c/include/plat/nand.h 2009-11-02 17:38:32.000000000 +0000 @@ -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; Index: b/drivers/mtd/nand/s3c2410.c =================================================================== --- a/drivers/mtd/nand/s3c2410.c 2009-11-02 17:35:55.000000000 +0000 +++ b/drivers/mtd/nand/s3c2410.c 2009-11-02 17:36:47.000000000 +0000 @@ -774,7 +774,7 @@ static void s3c2410_nand_init_chip(struc 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) {