summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorKevin Cernekee <cernekee@gmail.com>2011-05-08 10:47:59 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-05-25 02:02:20 +0100
commit16004f3685541c57a280bae3fde6562256fd0ba5 (patch)
tree5aa4cf21819bc2606b03f4ffdd207a9ed9e1d432 /drivers/mtd
parentc89eeda810f0ec4f0eee0206ebb79e476df9f83e (diff)
downloadop-kernel-dev-16004f3685541c57a280bae3fde6562256fd0ba5.zip
op-kernel-dev-16004f3685541c57a280bae3fde6562256fd0ba5.tar.gz
mtd: m25p80: Add Numonyx m25px32 family
Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1c17001..15231d6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/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) },
OpenPOWER on IntegriCloud