From mboxrd@z Thu Jan 1 00:00:00 1970 From: boris.brezillon@free-electrons.com (Boris Brezillon) Date: Sat, 16 Apr 2016 11:07:20 +0200 Subject: [PATCH 06/12] mtd: nand: gpmi: rely on generic DT parsing done in nand_scan_ident() In-Reply-To: <1459515272-31011-7-git-send-email-boris.brezillon@free-electrons.com> References: <1459515272-31011-1-git-send-email-boris.brezillon@free-electrons.com> <1459515272-31011-7-git-send-email-boris.brezillon@free-electrons.com> Message-ID: <20160416110720.462822e6@bbrezillon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Han, On Fri, 1 Apr 2016 14:54:26 +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. Can you review/test this patch? I'd like to have the whole series merged in this release. Thanks, Boris > > Signed-off-by: Boris Brezillon > --- > drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > index 8122c69..c6e8a1c 100644 > --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c > @@ -25,7 +25,6 @@ > #include > #include > #include > -#include > #include "gpmi-nand.h" > #include "bch-regs.h" > > @@ -1914,16 +1913,6 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) > /* Set up swap_block_mark, must be set before the gpmi_set_geometry() */ > this->swap_block_mark = !GPMI_IS_MX23(this); > > - if (of_get_nand_on_flash_bbt(this->dev->of_node)) { > - chip->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB; > - > - if (of_property_read_bool(this->dev->of_node, > - "fsl,no-blockmark-swap")) > - this->swap_block_mark = false; > - } > - dev_dbg(this->dev, "Blockmark swapping %sabled\n", > - this->swap_block_mark ? "en" : "dis"); > - > /* > * Allocate a temporary DMA buffer for reading ID in the > * nand_scan_ident(). > @@ -1938,6 +1927,16 @@ static int gpmi_nand_init(struct gpmi_nand_data *this) > if (ret) > goto err_out; > > + if (chip->bbt_options & NAND_BBT_USE_FLASH) { > + chip->bbt_options |= NAND_BBT_NO_OOB; > + > + if (of_property_read_bool(this->dev->of_node, > + "fsl,no-blockmark-swap")) > + this->swap_block_mark = false; > + } > + dev_dbg(this->dev, "Blockmark swapping %sabled\n", > + this->swap_block_mark ? "en" : "dis"); > + > ret = gpmi_init_last(this); > if (ret) > goto err_out; -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com