linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: omap2: mtd split nand_scan in ident and tail
@ 2011-04-14  8:54 Jan Weitzel
  0 siblings, 0 replies; 7+ messages in thread
From: Jan Weitzel @ 2011-04-14  8:54 UTC (permalink / raw)
  To: linux-omap-owner, linux-mtd
  Cc: Artem.Bityutskiy, tony, Jan Weitzel, s.hauer, s-ghorai,
	vimalsingh, dwmw2

nand_scan calls nand_scan_ident and nand_scan_tail, setting values like oobvail
according to ecc.layout. If we change the layout afterwards values are wrong.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
 drivers/mtd/nand/omap2.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index da9a351..288423f 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1073,9 +1073,9 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
 	/* DIP switches on some boards change between 8 and 16 bit
 	 * bus widths for flash.  Try the other width if the first try fails.
 	 */
-	if (nand_scan(&info->mtd, 1)) {
+	if (nand_scan_ident(&info->mtd, 1, NULL)) {
 		info->nand.options ^= NAND_BUSWIDTH_16;
-		if (nand_scan(&info->mtd, 1)) {
+		if (nand_scan_ident(&info->mtd, 1, NULL)) {
 			err = -ENXIO;
 			goto out_release_mem_region;
 		}
@@ -1101,6 +1101,12 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
 		info->nand.ecc.layout = &omap_oobinfo;
 	}
 
+	/* second phase scan */
+	if (nand_scan_tail(&info->mtd)) {
+		err = -ENXIO;
+		goto out_release_mem_region;
+	}
+
 #ifdef CONFIG_MTD_PARTITIONS
 	err = parse_mtd_partitions(&info->mtd, part_probes, &info->parts, 0);
 	if (err > 0)
-- 
1.7.0.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-04-20  9:00 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1302772529-15641-1-git-send-email-j.weitzel@phytec.de>
2011-04-15 13:34 ` [PATCH] ARM: omap2: mtd split nand_scan in ident and tail Jan Weitzel
2011-04-15 14:03   ` Artem Bityutskiy
2011-04-18  6:50     ` [PATCH v2] " Jan Weitzel
2011-04-18  6:59       ` Vimal Singh
2011-04-19 14:15         ` [PATCH v3] " Jan Weitzel
2011-04-20  9:00           ` Artem Bityutskiy
2011-04-14  8:54 [PATCH] " Jan Weitzel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).