From 04dec0d914bc4d619c7529048fdd8ee694bd3a6b Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 1 May 2012 04:04:00 +0200 Subject: [PATCH] --- yaml --- r: 310214 b: refs/heads/master c: 5ca11ca7ad950c60d4a30bbf9eb18555d537b226 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8eb8659fafa..cd7ce55b09c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1826dbccebc9a58a0b0c0a9b7c09e47b19d97398 +refs/heads/master: 5ca11ca7ad950c60d4a30bbf9eb18555d537b226 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 1924d247c1cb..85ce6fdc9e5d 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/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) },