summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorMarkus Niebel <Markus.Niebel@tqs.de>2013-08-20 09:54:41 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-08-30 22:44:10 +0200
commita3d7ee9ff80949e8786072eaf0b267499aec3d05 (patch)
tree930abc3cf39246054ac6202a512871346dc78e7e /drivers/mtd
parentmtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable (diff)
downloadlinux-a3d7ee9ff80949e8786072eaf0b267499aec3d05.tar.xz
linux-a3d7ee9ff80949e8786072eaf0b267499aec3d05.zip
mtd: m25p80: add support for mr25h10
This adds support for the Everspin mr25h10 MRAM chip to the m25p80 driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/devices/m25p80.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 6f93d32ce04b..a48f152e3180 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -743,6 +743,7 @@ static const struct spi_device_id m25p_ids[] = {
/* Everspin */
{ "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, M25P_NO_ERASE | M25P_NO_FR) },
+ { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, M25P_NO_ERASE | M25P_NO_FR) },
/* GigaDevice */
{ "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },