From patchwork Wed Oct 30 09:53:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 3113621 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 82B2F9F3E2 for ; Wed, 30 Oct 2013 09:53:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9382201EC for ; Wed, 30 Oct 2013 09:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA09A201E9 for ; Wed, 30 Oct 2013 09:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866Ab3J3JxO (ORCPT ); Wed, 30 Oct 2013 05:53:14 -0400 Received: from top.free-electrons.com ([176.31.233.9]:43386 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752784Ab3J3JxN (ORCPT ); Wed, 30 Oct 2013 05:53:13 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 4A1D982D; Wed, 30 Oct 2013 10:53:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from localhost.localdomain (unknown [190.2.98.212]) by mail.free-electrons.com (Postfix) with ESMTPA id C41F97CE; Wed, 30 Oct 2013 10:53:10 +0100 (CET) From: Ezequiel Garcia To: , Cc: Felipe Balbi , Pekon Gupta , Brian Norris , marek.belisko@gmail.com, Ezequiel Garcia Subject: [PATCH 1/1] mtd: nand: omap2: Fix device detection path Date: Wed, 30 Oct 2013 06:53:08 -0300 Message-Id: <1383126788-27426-2-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1383126788-27426-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1383126788-27426-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because the device bus can be 8-bit or 16-bit width, yet ONFI detection cannot work in 16-bit mode, we need to set the NAND_BUSWIDTH_AUTO option which allows proper initialization configuration. Once the bus width is detected, nand_scan_ident() updates the nand_chip struct 'option' field to use the appropriate read/write functions and configure the ECC engine. Signed-off-by: Ezequiel Garcia --- drivers/mtd/nand/omap2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index ec40b8d..c71206b 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1662,7 +1662,7 @@ static int omap_nand_probe(struct platform_device *pdev) mtd->owner = THIS_MODULE; nand_chip = &info->nand; nand_chip->ecc.priv = NULL; - nand_chip->options |= NAND_SKIP_BBTSCAN; + nand_chip->options |= NAND_SKIP_BBTSCAN | NAND_BUSWIDTH_AUTO; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { @@ -1708,7 +1708,6 @@ static int omap_nand_probe(struct platform_device *pdev) } /* scan NAND device connected to chip controller */ - nand_chip->options |= pdata->devsize & NAND_BUSWIDTH_16; if (nand_scan_ident(mtd, 1, NULL)) { pr_err("nand device scan failed, may be bus-width mismatch\n"); err = -ENXIO;