From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751233AbcDPHlE (ORCPT ); Sat, 16 Apr 2016 03:41:04 -0400 Received: from down.free-electrons.com ([37.187.137.238]:47303 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751024AbcDPHlC convert rfc822-to-8bit (ORCPT ); Sat, 16 Apr 2016 03:41:02 -0400 Date: Sat, 16 Apr 2016 09:40:59 +0200 From: Boris Brezillon To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= Cc: linux-mtd@lists.infradead.org, Wenyou Yang , Josh Wu , Richard Weinberger , David Woodhouse , Brian Norris , linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH 04/12] mtd: nand: atmel: set ECC algorithm explicitly Message-ID: <20160416094059.44d6a6aa@bbrezillon> In-Reply-To: <1460750052-16285-5-git-send-email-zajec5@gmail.com> References: <1460750052-16285-1-git-send-email-zajec5@gmail.com> <1460750052-16285-5-git-send-email-zajec5@gmail.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=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 15 Apr 2016 21:54:04 +0200 Rafał Miłecki wrote: > Set it to value obtained from platform data with fallback to Hamming. > This is part of process deprecating NAND_ECC_SOFT_BCH (and switching to > enum nand_ecc_algo). > > Signed-off-by: Rafał Miłecki > --- > drivers/mtd/nand/atmel_nand.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c > index eec8ca7..6aa82e4 100644 > --- a/drivers/mtd/nand/atmel_nand.c > +++ b/drivers/mtd/nand/atmel_nand.c > @@ -1212,6 +1212,7 @@ static int atmel_pmecc_nand_init_params(struct platform_device *pdev, > dev_warn(host->dev, > "Can't get I/O resource regs for PMECC controller, rolling back on software ECC\n"); > nand_chip->ecc.mode = NAND_ECC_SOFT; > + nand_chip->ecc.algo = NAND_ECC_HAMMING; > return 0; > } > > @@ -1295,6 +1296,7 @@ static int atmel_pmecc_nand_init_params(struct platform_device *pdev, > /* page size not handled by HW ECC */ > /* switching back to soft ECC */ > nand_chip->ecc.mode = NAND_ECC_SOFT; > + nand_chip->ecc.algo = NAND_ECC_HAMMING; > return 0; > } > > @@ -1613,6 +1615,7 @@ static int atmel_of_init_port(struct atmel_nand_host *host, > * even if the nand-ecc-mode property is not defined. > */ > host->nand_chip.ecc.mode = NAND_ECC_SOFT; > + host->nand_chip.ecc.algo = NAND_ECC_HAMMING; > > return 0; > } > @@ -1629,6 +1632,7 @@ static int atmel_hw_nand_init_params(struct platform_device *pdev, > dev_err(host->dev, > "Can't get I/O resource regs, use software ECC\n"); > nand_chip->ecc.mode = NAND_ECC_SOFT; > + nand_chip->ecc.algo = NAND_ECC_HAMMING; > return 0; > } > > @@ -1661,6 +1665,7 @@ static int atmel_hw_nand_init_params(struct platform_device *pdev, > /* page size not handled by HW ECC */ > /* switching back to soft ECC */ > nand_chip->ecc.mode = NAND_ECC_SOFT; > + nand_chip->ecc.algo = NAND_ECC_HAMMING; > return 0; > } > > @@ -2159,6 +2164,7 @@ static int atmel_nand_probe(struct platform_device *pdev) > memcpy(&host->board, dev_get_platdata(&pdev->dev), > sizeof(struct atmel_nand_data)); > nand_chip->ecc.mode = host->board.ecc_mode; > + nand_chip->ecc.algo = host->board.ecc_algo; If you follow my suggestion on patch 3, it should be: if (host->board.ecc_mode == NAND_ECC_SOFT) nand_chip->ecc.algo = NAND_ECC_HAMMING; This way we avoid any dependency between the avr32 and nand tree. > > /* 16-bit bus width */ > if (host->board.bus_width_16) -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com