From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1arthK-000723-EI for linux-mtd@lists.infradead.org; Sun, 17 Apr 2016 20:53:39 +0000 Received: by mail-lf0-x22b.google.com with SMTP id e190so196779698lfe.0 for ; Sun, 17 Apr 2016 13:53:21 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Boris Brezillon Cc: linux-mtd@lists.infradead.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Richard Weinberger , David Woodhouse , Brian Norris , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V3 02/11] mtd: nand: davinci: set ECC algorithm explicitly Date: Sun, 17 Apr 2016 22:52:58 +0200 Message-Id: <1460926387-9563-3-git-send-email-zajec5@gmail.com> In-Reply-To: <1460926387-9563-1-git-send-email-zajec5@gmail.com> References: <1460913104-27388-1-git-send-email-zajec5@gmail.com> <1460926387-9563-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This is part of process deprecating NAND_ECC_SOFT_BCH (and switching to enum nand_ecc_algo). Signed-off-by: Rafał Miłecki Signed-off-by: Boris Brezillon --- drivers/mtd/nand/davinci_nand.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index fe3fd29..b0a2801 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -738,6 +738,14 @@ static int nand_davinci_probe(struct platform_device *pdev) } info->chip.ecc.mode = ecc_mode; + /* + * When using software ECC this driver support hamming only. Force + * ecc.algo to NAND_ECC_HAMMING to avoid adding an extra ->ecc_algo + * field to davinci_nand_pdata. + */ + if (ecc_mode == NAND_ECC_SOFT) + info->chip.ecc.algo = NAND_ECC_HAMMING; + info->clk = devm_clk_get(&pdev->dev, "aemif"); if (IS_ERR(info->clk)) { ret = PTR_ERR(info->clk); -- 1.8.4.5