From b67db388233577734d7ffade2be8eec38604d524 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Sun, 8 May 2011 10:47:59 -0700 Subject: [PATCH] --- yaml --- r: 252493 b: refs/heads/master c: 16004f3685541c57a280bae3fde6562256fd0ba5 h: refs/heads/master i: 252491: 98f118139282ef2f63c06231e138403764c14949 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cd35e5477476..9f3a8b6a0be0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c89eeda810f0ec4f0eee0206ebb79e476df9f83e +refs/heads/master: 16004f3685541c57a280bae3fde6562256fd0ba5 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 1c170019b886..15231d6d7012 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -730,7 +730,10 @@ static const struct spi_device_id m25p_ids[] = { { "m25pe80", INFO(0x208014, 0, 64 * 1024, 16, 0) }, { "m25pe16", INFO(0x208015, 0, 64 * 1024, 32, SECT_4K) }, - { "m25px64", INFO(0x207117, 0, 64 * 1024, 128, 0) }, + { "m25px32", INFO(0x207116, 0, 64 * 1024, 64, SECT_4K) }, + { "m25px32-s0", INFO(0x207316, 0, 64 * 1024, 64, SECT_4K) }, + { "m25px32-s1", INFO(0x206316, 0, 64 * 1024, 64, SECT_4K) }, + { "m25px64", INFO(0x207117, 0, 64 * 1024, 128, 0) }, /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */ { "w25x10", INFO(0xef3011, 0, 64 * 1024, 2, SECT_4K) },