1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index a48f152e3180..26b14f9fcac6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -43,6 +43,7 @@
 #define OPCODE_FAST_READ        0x0b    /* Read data bytes (high frequency) */
 #define OPCODE_PP               0x02    /* Page program (up to 256 bytes) */
 #define OPCODE_BE_4K            0x20    /* Erase 4KiB block */
+#define OPCODE_BE_4K_PMC        0xd7    /* Erase 4KiB block on PMC chips */
 #define OPCODE_BE_32K           0x52    /* Erase 32KiB block */
 #define OPCODE_CHIP_ERASE       0xc7    /* Erase whole flash chip */
 #define OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
@@ -692,6 +693,7 @@ struct flash_info {
 #define M25P_NO_ERASE   0x02            /* No erase command needed */
 #define SST_WRITE       0x04            /* use SST byte programming */
 #define M25P_NO_FR      0x08            /* Can't do fastread */
+#define SECT_4K_PMC     0x10            /* OPCODE_BE_4K_PMC works uniformly */
 };
 
 #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)      \
@@ -773,6 +775,11 @@ static const struct spi_device_id m25p_ids[] = {
         { "n25q128a13",  INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
         { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
 
+        /* PMC */
+        { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+        { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
+        { "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024,  64, SECT_4K) },
+
         /* Spansion -- single (large) sector size only, at least
          * for the chips listed here (without boot sectors).
          */
@@ -1026,6 +1033,9 @@ static int m25p_probe(struct spi_device *spi)
         if (info->flags & SECT_4K) {
                 flash->erase_opcode = OPCODE_BE_4K;
                 flash->mtd.erasesize = 4096;
+        } else if (info->flags & SECT_4K_PMC) {
+                flash->erase_opcode = OPCODE_BE_4K_PMC;
+                flash->mtd.erasesize = 4096;
         } else {
                 flash->erase_opcode = OPCODE_SE;
                 flash->mtd.erasesize = info->sector_size;