From: Siddarth Gore <gores@marvell.com>
Date: Tue, 4 Aug 2009 03:12:08 +0000 (+0530)
Subject: mtd: m25p80: add support for 3 Macronix flash chips
X-Git-Tag: v2.6.32-rc1~160^2~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b0469ea785d12a6c025fa213293d608fc41405fe;p=karo-tx-linux.git

mtd: m25p80: add support for 3 Macronix flash chips

Signed-off-by: Siddarth Gore <gores@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 10ed195c0c1c..6d8d265ae91a 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -501,7 +501,10 @@ static struct flash_info __devinitdata m25p_data [] = {
 	{ "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
 
 	/* Macronix */
+	{ "mx25l3205d", 0xc22016, 0, 64 * 1024, 64, },
+	{ "mx25l6405d", 0xc22017, 0, 64 * 1024, 128, },
 	{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+	{ "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
 
 	/* Spansion -- single (large) sector size only, at least
 	 * for the chips listed here (without boot sectors).