generic: fix erase operation on the pm25lv flash chip

[openwrt.git] / target / linux / generic / patches-2.6.35 / 084-mtd_m25p80_add_pm25lv_flash_support.patch

diff --git a/target/linux/generic/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 96a5bd0..3c014aa 100644 (file)
--- a/target/linux/generic/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -1,13 +1,39 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+@@ -41,6 +41,7 @@
+ #define       OPCODE_BE_4K            0x20    /* Erase 4KiB block */
+ #define       OPCODE_BE_32K           0x52    /* Erase 32KiB block */
+ #define       OPCODE_CHIP_ERASE       0xc7    /* Erase whole flash chip */
++#define       OPCODE_BE_4K_PMC        0xd7    /* Erase 4KiB block on PMC chips*/
+ #define       OPCODE_SE               0xd8    /* Sector erase (usually 64KiB) */
+ #define       OPCODE_RDID             0x9f    /* Read JEDEC ID */
+ 
+@@ -600,6 +601,7 @@ struct flash_info {
+       u16             flags;
+ #define       SECT_4K         0x01            /* OPCODE_BE_4K works uniformly */
+ #define       M25P_NO_ERASE   0x02            /* No erase command needed */
++#define       SECT_4K_PMC     0x04            /* OPCODE_BE_4K_PMC works uniformly */
+ };
+ 
+ #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)    \
+@@ -646,6 +648,10 @@ static const struct spi_device_id m25p_i
        { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  
 +      /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+      { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
-+      { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
++      { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
++      { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
 +
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).
         */
+@@ -858,6 +864,9 @@ static int __devinit m25p_probe(struct s
+       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;