mtd: m25p80: Disable 4KiB erase for s25sl032p, s25sl064p

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=b277f77e5d6cac15bedde341b571a81fb0db2260
Commit:     b277f77e5d6cac15bedde341b571a81fb0db2260
Parent:     5fe42d5bf2deac62bf2a532b30deacc007805b91
Author:     Marek Vasut <marex at denx.de>
AuthorDate: Tue Sep 4 05:31:36 2012 +0200
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Sat Sep 29 15:40:19 2012 +0100

    mtd: m25p80: Disable 4KiB erase for s25sl032p, s25sl064p
    
    Quoting from the datasheet for S25FL064P, rev. 05, Nov 18 2011, § 9.17:
    
    "A 64 kB[sic] sector erase (D8h) command issued on 4 kB or 8 kB erase
    sectors will erase all sectors in the specified 64 kB region. However,
    please note that a 4 kB sector erase (20h) or 8 kB sector erase (40h)
    command will not work on a 64 kB sector."
    
    Referring further to Table 8.1 and Table 8.2, it is clearly seen
    that most of the sectors are 64KiB; therefore disable this 4KiB
    erase support since it's valid only on first/last sectors.
    
    Signed-off-by: Marek Vasut <marex at denx.de>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/m25p80.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 33213c7..03838ba 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -670,8 +670,8 @@ static const struct spi_device_id m25p_ids[] = {
 	/* Spansion -- single (large) sector size only, at least
 	 * for the chips listed here (without boot sectors).
 	 */
-	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, SECT_4K) },
-	{ "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, SECT_4K) },
+	{ "s25sl032p",  INFO(0x010215, 0x4d00,  64 * 1024,  64, 0) },
+	{ "s25sl064p",  INFO(0x010216, 0x4d00,  64 * 1024, 128, 0) },
 	{ "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
 	{ "s25fl256s1", INFO(0x010219, 0x4d01,  64 * 1024, 512, 0) },
 	{ "s25fl512s",  INFO(0x010220, 0x4d00, 256 * 1024, 256, 0) },