1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

generic: fix erase operation on the pm25lv flash chip

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22861 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2010-08-31 20:06:38 +00:00
parent 4149596e58
commit 2bbe78f8f6
18 changed files with 180 additions and 50 deletions

View File

@@ -1,13 +1,39 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -626,6 +626,10 @@ static struct flash_info __devinitdata m
@@ -42,6 +42,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_ALT 0xd7 /* Erase 4KiB block */
#define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */
#define OPCODE_RDID 0x9f /* Read JEDEC ID */
@@ -599,6 +600,7 @@ struct flash_info {
u16 flags;
#define SECT_4K 0x01 /* OPCODE_BE_4K works uniformly */
+#define SECT_4K_ALT 0x02 /* OPCODE_BE_4K_ALT works uniformly */
};
@@ -626,6 +628,10 @@ static struct flash_info __devinitdata m
{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
{ "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
+ /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+ { "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K },
+ { "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K },
+ { "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K_ALT },
+ { "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K_ALT },
+
/* Spansion -- single (large) sector size only, at least
* for the chips listed here (without boot sectors).
*/
@@ -807,6 +813,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_ALT) {
+ flash->erase_opcode = OPCODE_BE_4K_ALT;
+ flash->mtd.erasesize = 4096;
} else {
flash->erase_opcode = OPCODE_SE;
flash->mtd.erasesize = info->sector_size;

View File

@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -626,6 +626,10 @@ static struct flash_info __devinitdata m
@@ -628,6 +628,10 @@ static struct flash_info __devinitdata m
{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
{ "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, },
@@ -9,5 +9,5 @@
+ { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
{ "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K },
{ "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K },
{ "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K_ALT },
{ "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K_ALT },

View File

@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
@@ -632,6 +632,11 @@ static struct flash_info __devinitdata m
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
@@ -10,9 +10,9 @@
+ { "640s33b", 0x898913, 0, 64 * 1024, 128, },
+
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
{ "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K },
{ "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K },
@@ -784,11 +789,12 @@ static int __devinit m25p_probe(struct s
{ "pm25lv512", 0, 0, 32 * 1024, 2, SECT_4K_ALT },
{ "pm25lv010", 0, 0, 32 * 1024, 4, SECT_4K_ALT },
@@ -786,11 +791,12 @@ static int __devinit m25p_probe(struct s
dev_set_drvdata(&spi->dev, flash);
/*

View File

@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -687,6 +687,7 @@ static struct flash_info __devinitdata m
@@ -689,6 +689,7 @@ static struct flash_info __devinitdata m
{ "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, },
{ "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
{ "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },