Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934291AbcDLWWh (ORCPT ); Tue, 12 Apr 2016 18:22:37 -0400 Received: from down.free-electrons.com ([37.187.137.238]:50609 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758427AbcDLWWe (ORCPT ); Tue, 12 Apr 2016 18:22:34 -0400 Date: Wed, 13 Apr 2016 00:22:30 +0200 From: Boris Brezillon To: Roger Quadros , Tony Lindgren , Wenyou Yang , Josh Wu , Boris Brezillon , Richard Weinberger , linux-mtd@lists.infradead.org, David Woodhouse , Brian Norris , Kamal Dasu , Han Xu , Ezequiel Garcia , Stefan Agner Cc: linux-omap@vger.kernel.org, Nicolas Ferre , Jean-Christophe Plagniol-Villard , Alexandre Belloni , Thomas Petazzoni , Gregory CLEMENT , Jason Cooper , Sebastian Hesselbarth , Andrew Lunn , Daniel Mack , Haojian Zhuang , Robert Jarzmik , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , linux-sunxi@googlegroups.com, Zhou Wang , Alex Smith , Harvey Hunt Subject: Re: [PATCH 03/12] mtd: nand: omap2: rely on generic DT parsing done in nand_scan_ident() Message-ID: <20160413002230.59f0930b@bbrezillon> In-Reply-To: <1459515272-31011-4-git-send-email-boris.brezillon@free-electrons.com> References: <1459515272-31011-1-git-send-email-boris.brezillon@free-electrons.com> <1459515272-31011-4-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2422 Lines: 76 On Fri, 1 Apr 2016 14:54:23 +0200 Boris Brezillon wrote: > The core now takes care of parsing generic DT properties in > nand_scan_ident() when nand_set_flash_node() has been called. > Rely on this initialization instead of calling of_get_nand_xxx() > manually. > > Signed-off-by: Boris Brezillon Applied. > --- > drivers/memory/omap-gpmc.c | 7 ------- > drivers/mtd/nand/omap2.c | 9 ++++++--- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c > index 21825dd..85aa85e 100644 > --- a/drivers/memory/omap-gpmc.c > +++ b/drivers/memory/omap-gpmc.c > @@ -25,7 +25,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -1876,12 +1875,6 @@ static int gpmc_probe_nand_child(struct platform_device *pdev, > break; > } > > - gpmc_nand_data->flash_bbt = of_get_nand_on_flash_bbt(child); > - > - val = of_get_nand_bus_width(child); > - if (val == 16) > - gpmc_nand_data->devsize = NAND_BUSWIDTH_16; > - > gpmc_read_timings_dt(child, &gpmc_t); > gpmc_nand_init(gpmc_nand_data, &gpmc_t); > > diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c > index 0749ca1..8921283 100644 > --- a/drivers/mtd/nand/omap2.c > +++ b/drivers/mtd/nand/omap2.c > @@ -1704,9 +1704,7 @@ static int omap_nand_probe(struct platform_device *pdev) > } > > if (pdata->flash_bbt) > - nand_chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB; > - else > - nand_chip->options |= NAND_SKIP_BBTSCAN; > + nand_chip->bbt_options |= NAND_BBT_USE_FLASH; > > /* scan NAND device connected to chip controller */ > nand_chip->options |= pdata->devsize & NAND_BUSWIDTH_16; > @@ -1716,6 +1714,11 @@ static int omap_nand_probe(struct platform_device *pdev) > goto return_error; > } > > + if (nand_chip->bbt_options & NAND_BBT_USE_FLASH) > + nand_chip->bbt_options |= NAND_BBT_NO_OOB; > + else > + nand_chip->options |= NAND_SKIP_BBTSCAN; > + > /* re-populate low-level callbacks based on xfer modes */ > switch (pdata->xfer_type) { > case NAND_OMAP_PREFETCH_POLLED: -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com