From patchwork Thu Apr 14 09:15:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Weitzel X-Patchwork-Id: 706761 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3E9FXKI013578 for ; Thu, 14 Apr 2011 09:15:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932200Ab1DNJPc (ORCPT ); Thu, 14 Apr 2011 05:15:32 -0400 Received: from mail.visioncatalog.com ([217.6.246.34]:51817 "EHLO root.phytec.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753985Ab1DNJPb (ORCPT ); Thu, 14 Apr 2011 05:15:31 -0400 Received: from idefix.phytec.de (idefix.phytec.de [172.16.0.10]) by root.phytec.de (Postfix) with ESMTP id 581AABF0E6 for ; Thu, 14 Apr 2011 11:17:35 +0200 (CEST) Received: from numalfix.phytec.de ([127.0.0.1]) by idefix.phytec.de (Lotus Domino Release 8.5.2 HF194) with ESMTP id 2011041411153042-175395 ; Thu, 14 Apr 2011 11:15:30 +0200 Received: by numalfix.phytec.de (Postfix, from userid 1002) id 5C8D11A17BC; Thu, 14 Apr 2011 11:15:30 +0200 (CEST) From: Jan Weitzel To: linux-omap@vger.kernel.org Cc: Jan Weitzel Subject: [PATCH] ARM: omap2: mtd split nand_scan in ident and tail Date: Thu, 14 Apr 2011 11:15:29 +0200 Message-Id: <1302772529-15641-1-git-send-email-j.weitzel@phytec.de> X-Mailer: git-send-email 1.7.0.4 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 8.5.2 HF194|November 09, 2010) at 14.04.2011 11:15:30, Serialize by Router on Idefix/Phytec(Release 8.5.2 HF194|November 09, 2010) at 14.04.2011 11:15:30, Serialize complete at 14.04.2011 11:15:30 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Apr 2011 09:15:33 +0000 (UTC) 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 --- 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)