linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mtd: nand: omap: Fix NAND enumeration on 3430 LDP
@ 2014-11-05 11:00 Roger Quadros
  2014-11-06 18:03 ` Tony Lindgren
  2014-11-19 12:22 ` [PATCH v2] " Roger Quadros
  0 siblings, 2 replies; 14+ messages in thread
From: Roger Quadros @ 2014-11-05 11:00 UTC (permalink / raw)
  To: computersforpeace, dwmw2
  Cc: ezequiel, tony, linux-mtd, linux-omap, pekon, Roger Quadros,
	stable

In commit 7d5929c1f343 ("mtd: nand: omap: Revert to using software ECC by default"),
we switched back to using 1-bit SW ECC scheme by default. However
commit b491da7233d5 ("mtd: nand: omap: clean-up ecc layout for BCH ecc schemes")
didn't take into account the 1-bit SW scheme (i.e. OMAP_ECC_HAM1_CODE_SW)
when checking for small page devices because it was already got rid of
one commit earlier. Consider OMAP_ECC_HAM1_CODE_SW while deciding
if we can proceed with small page devices or not.

Fixes: 7d5929c1f34 ("mtd: nand: omap: Revert to using software ECC by default")

Cc: <stable@vger.kernel.org>        [3.17+]
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/mtd/nand/omap2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 3b357e9..758e594 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1742,7 +1742,8 @@ static int omap_nand_probe(struct platform_device *pdev)
 	}
 
 	/* check for small page devices */
-	if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW)) {
+	if ((mtd->oobsize < 64) && (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_HW) &&
+	    (pdata->ecc_opt != OMAP_ECC_HAM1_CODE_SW)) {
 		dev_err(&info->pdev->dev, "small page devices are not supported\n");
 		err = -EINVAL;
 		goto return_error;
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2014-11-26  6:47 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-05 11:00 [PATCH] mtd: nand: omap: Fix NAND enumeration on 3430 LDP Roger Quadros
2014-11-06 18:03 ` Tony Lindgren
2014-11-07  9:35   ` Roger Quadros
2014-11-07  9:58     ` Roger Quadros
2014-11-07 22:48       ` Tony Lindgren
2014-11-09 19:29         ` pekon
2014-11-12 18:02           ` Tony Lindgren
2014-11-13 11:29             ` Roger Quadros
2014-11-13 16:00               ` Tom Rini
2014-11-13 17:54                 ` Tony Lindgren
2014-11-15 11:12               ` pekon
2014-11-13 12:00           ` Roger Quadros
2014-11-19 12:22 ` [PATCH v2] " Roger Quadros
2014-11-26  6:47   ` Brian Norris

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).