summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices/m25p80.c
diff options
context:
space:
mode:
authorMarek Vasut2012-05-01 04:04:00 +0200
committerDavid Woodhouse2012-05-14 06:15:48 +0200
commit5ca11ca7ad950c60d4a30bbf9eb18555d537b226 (patch)
tree7710fa6eaee983edfd91e8da7fb41fa8ecbe0240 /drivers/mtd/devices/m25p80.c
parentmtd: nand: kill NAND_NO_AUTOINCR option (diff)
downloadkernel-qcow2-linux-5ca11ca7ad950c60d4a30bbf9eb18555d537b226.tar.gz
kernel-qcow2-linux-5ca11ca7ad950c60d4a30bbf9eb18555d537b226.tar.xz
kernel-qcow2-linux-5ca11ca7ad950c60d4a30bbf9eb18555d537b226.zip
mtd: m25p80: add support for Everspin MR25H256 MRAM chip
This chip isn't JEDEC-compatible. Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
-rw-r--r--drivers/mtd/devices/m25p80.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 1924d247c1cb..85ce6fdc9e5d 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -639,6 +639,9 @@ static const struct spi_device_id m25p_ids[] = {
{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) },
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
+ /* Everspin */
+ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) },
+
/* Intel/Numonyx -- xxxs33b */
{ "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) },
{ "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) },