1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index cc6369ea67dd..ae5fe91867e1 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -54,7 +54,7 @@
 #define SR_SRWD                 0x80    /* SR write protect */
 
 /* Define max times to check status register before we give up. */
-#define MAX_READY_WAIT_JIFFIES  (10 * HZ)       /* eg. M25P128 specs 6s max sector erase */
+#define MAX_READY_WAIT_JIFFIES  (40 * HZ)       /* M25P16 specs 40s max chip erase */
 #define CMD_SIZE                4
 
 #ifdef CONFIG_M25PXX_USE_FAST_READ
@@ -500,6 +500,9 @@ static struct flash_info __devinitdata m25p_data [] = {
         { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
         { "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
 
+        /* Macronix */
+        { "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+
         /* Spansion -- single (large) sector size only, at least
          * for the chips listed here (without boot sectors).
          */
@@ -528,6 +531,7 @@ static struct flash_info __devinitdata m25p_data [] = {
         { "m25p64",  0x202017,  0, 64 * 1024, 128, },
         { "m25p128", 0x202018, 0, 256 * 1024, 64, },
 
+        { "m45pe10", 0x204011,  0, 64 * 1024, 2, },
         { "m45pe80", 0x204014,  0, 64 * 1024, 16, },
         { "m45pe16", 0x204015,  0, 64 * 1024, 32, },