mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-21 16:03:20 +03:00
Based on 3.3-rc2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29986 3c298f89-4303-0410-b956-a3cf2f4a3e73
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -45,6 +45,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 */
|
|
|
|
@@ -625,6 +626,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) \
|
|
@@ -686,6 +688,10 @@ static const struct spi_device_id m25p_i
|
|
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
|
|
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
|
|
|
+ /* PMC -- pm25x "blocks" are 32K, sectors are 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).
|
|
*/
|
|
@@ -921,6 +927,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;
|