From: Roger Quadros Date: Wed, 19 Nov 2014 12:22:23 +0000 (+0200) Subject: mtd: nand: omap: Fix NAND enumeration on 3430 LDP X-Git-Tag: v4.14-rc1~6266^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=775a9134f4398ca98a10af8cc3cf9b664017267f;p=platform%2Fkernel%2Flinux-rpi.git mtd: nand: omap: Fix NAND enumeration on 3430 LDP 3430LDP has NAND flash with 32 bytes OOB size which is sufficient to hold BCH8 codes but the small page check introduced in commit b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") considers anything below 64 bytes unsuitable for BCH4/8/16. There is another bug in that code where it doesn't skip the check for OMAP_ECC_HAM1_CODE_SW. Get rid of that small page check code as it is insufficient and redundant because we are checking for OOB available bytes vs ecc layout before calling nand_scan_tail(). Fixes: b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes") Reported-by: Tony Lindgren Signed-off-by: Roger Quadros Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 1ec0a1db..80250ad 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1742,13 +1742,6 @@ static int omap_nand_probe(struct platform_device *pdev) goto return_error; } - /* check for small page devices */ - if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW)) { - dev_err(&info->pdev->dev, "small page devices are not supported\n"); - err = -EINVAL; - goto return_error; - } - /* re-populate low-level callbacks based on xfer modes */ switch (pdata->xfer_type) { case NAND_OMAP_PREFETCH_POLLED: