summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2013-02-22 14:07:22 -0800
committerJavier Jardón <jjardon@gnome.org>2015-05-06 16:15:37 +0100
commitc8b96097cdbb6dd69c5e05a2c3a8d39fa6ed2c0c (patch)
treeb50b307f59d0aa510869c688e80226aa59b6c4f7
parent3dd2b66d7e41e2e0c42cd4e0d9e260569082462d (diff)
downloadlinux-stable-c8b96097cdbb6dd69c5e05a2c3a8d39fa6ed2c0c.tar.gz
mtd: m25p80: n25q064 is Micron, not Intel/Numonyx
Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> (cherry picked from commit e66e280c36e09e4573089862e7dc2ade9e680088)
-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 abb536685134..8de0412b97b4 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -666,6 +666,7 @@ static struct flash_info __devinitdata m25p_data [] = {
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
/* Micron */
+ { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
{ "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) },
{ "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
{ "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },