mtd: omap2: mtd split nand_scan in ident and tail

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=a80f1c1f6a15e4eeba5c146ec9c5c0e12458abc5
Commit:     a80f1c1f6a15e4eeba5c146ec9c5c0e12458abc5
Parent:     94735ec4044a6d318b83ad3c5794e931ed168d10
Author:     Jan Weitzel <j.weitzel at phytec.de>
AuthorDate: Tue Apr 19 16:15:34 2011 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed May 25 01:54:39 2011 +0100

    mtd: omap2: mtd split nand_scan in ident and tail
    
    nand_scan calls nand_scan_tail and here we got a ecc.layout and calculate
    oobavail for this layout. After calling nand_scan, we change the layout pointer
    if OMAP_ECC_HAMMING_CODE_HW_ROMCODE is set. This results in not calcluated
    oobavail. Mountig as jffs2 is not possible.
    
    To fix that nand_scan has to split up in nand_scan_ident and nand_scan_tail
    setting ecc.layout between these calls. So nand_scan_tail calculates oobvail
    for the used layout. This is also done in serveral other platforms.
    
    Signed-off-by: Jan Weitzel <j.weitzel at phytec.de>
    Reviewed-by: Vimal Singh <vimal.newwork at gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 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)