Skip to contentSkip to conversation

s3c2410: propogate nand options from the platform data

PATCH Ben Dooks 1 participant 1 message Nov 2, 2009

Subsystems (5)
Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) Arm Samsung Exynos +1 more subsystems
lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

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 <[email protected]>
Signed-off-by Simtec Linux Team <[email protected]>
---
 arch/arm/plat-s3c/include/plat/nand.h |    2 ++
 drivers/mtd/nand/s3c2410.c            |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm/plat-s3c/include/plat/nand.h +2 -0
Index: 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;
drivers/mtd/nand/s3c2410.c +1 -1
Index: b/drivers/mtd/nand/s3c2410.c
===================================================================
@@ -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) {
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/)

  'a smiley only costs 4 bytes'