[Linux-kernel-commits] [8941] trunk/drivers/mtd/devices/m25p80.c: [#5975] mtd: m25p80: Fix false-positiveprobing

[bhsong]

Title: [8941] trunk/drivers/mtd/devices/m25p80.c: [#5975] mtd: m25p80: Fix false-positiveprobing

Revision

8941

Author

bhsong

Date

2010-06-24 06:45:22 -0400 (Thu, 24 Jun 2010)

Log Message

[#5975] mtd: m25p80: Fix false-positiveprobing

From: David Woodhouse <dw...@infradead.org>

Since commit 18c6182bae0acca220ed6611f741034d563cd19f ("Rework
probing/JEDEC code"), m25p80 driver successfully registers chips
even if JEDEC probing fails.

This was needed to support non-JEDEC flashes. Though, it appears
that some platforms (e.g. blackfin bf533 stamp[1]) used the old
behavior to detect if there's any flash connected, so the driver
have to fail on JEDEC probing errors.

This patch restores the old behavior for JEDEC flashes, and adds
"-nonjedec" SPI device IDs for M25Pxx flashes, so that the kernel
still supports non-JEDEC flashes.

[1] http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=""

Reported-by: Mingquan Pan
Reported-by: Barry Song <21cn...@gmail.com>
Signed-off-by: Anton Vorontsov <avoront...@mvista.com>

Modified Paths

• trunk/drivers/mtd/devices/m25p80.c

Diff

Modified: trunk/drivers/mtd/devices/m25p80.c (8940 => 8941)

--- trunk/drivers/mtd/devices/m25p80.c	2010-06-24 10:40:22 UTC (rev 8940)
+++ trunk/drivers/mtd/devices/m25p80.c	2010-06-24 10:45:22 UTC (rev 8941)
@@ -680,6 +680,16 @@
 	{ "m25p64",  INFO(0x202017,  0,  64 * 1024, 128, 0) },
 	{ "m25p128", INFO(0x202018,  0, 256 * 1024,  64, 0) },
 
+	{ "m25p05-nonjedec",  INFO(0, 0,  32 * 1024,   2, 0) },
+	{ "m25p10-nonjedec",  INFO(0, 0,  32 * 1024,   4, 0) },
+	{ "m25p20-nonjedec",  INFO(0, 0,  64 * 1024,   4, 0) },
+	{ "m25p40-nonjedec",  INFO(0, 0,  64 * 1024,   8, 0) },
+	{ "m25p80-nonjedec",  INFO(0, 0,  64 * 1024,  16, 0) },
+	{ "m25p16-nonjedec",  INFO(0, 0,  64 * 1024,  32, 0) },
+	{ "m25p32-nonjedec",  INFO(0, 0,  64 * 1024,  64, 0) },
+	{ "m25p64-nonjedec",  INFO(0, 0,  64 * 1024, 128, 0) },
+	{ "m25p128-nonjedec", INFO(0, 0, 256 * 1024,  64, 0) },
+
 	{ "m45pe10", INFO(0x204011,  0, 64 * 1024,    2, 0) },
 	{ "m45pe80", INFO(0x204014,  0, 64 * 1024,   16, 0) },
 	{ "m45pe16", INFO(0x204015,  0, 64 * 1024,   32, 0) },
@@ -795,8 +805,7 @@
 
 		jid = jedec_probe(spi);
 		if (!jid) {
-			dev_info(&spi->dev, "non-JEDEC variant of %s\n",
-				 id->name);
+			return -ENODEV;
 		} else if (jid != id) {
 			/*
 			 * JEDEC knows better, so overwrite platform ID. We

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits