summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.32
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-08-31 20:06:38 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-08-31 20:06:38 +0000
commit7782fcf8746bd43f5815432a6bde8471793ffa27 (patch)
treecc82ac58befdc1b3b41b376b46f5a32cf13bc8ef /target/linux/generic/patches-2.6.32
parent19654fd1c26e8f54fdd15734df1dbbd2a3d185e3 (diff)
downloadmtk-20170518-7782fcf8746bd43f5815432a6bde8471793ffa27.zip
mtk-20170518-7782fcf8746bd43f5815432a6bde8471793ffa27.tar.gz
mtk-20170518-7782fcf8746bd43f5815432a6bde8471793ffa27.tar.bz2
generic: fix erase operation on the pm25lv flash chip
SVN-Revision: 22861
Diffstat (limited to 'target/linux/generic/patches-2.6.32')
-rw-r--r--target/linux/generic/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch32
-rw-r--r--target/linux/generic/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch6
-rw-r--r--target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch8
-rw-r--r--target/linux/generic/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch2
4 files changed, 37 insertions, 11 deletions
diff --git a/target/linux/generic/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
index ce70690..1e31e3b 100644
--- a/target/linux/generic/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-2.6.32/084-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -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;
diff --git a/target/linux/generic/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
index 2155584..348e390 100644
--- a/target/linux/generic/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic/patches-2.6.32/085-mtd_m25p80_add_en25pxx_support.patch
@@ -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 },
diff --git a/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
index 83d5cdd..16c21aa 100644
--- a/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.32/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -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);
/*
diff --git a/target/linux/generic/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
index 5f44c1d..75425d2 100644
--- a/target/linux/generic/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.32/087-mtd-m25p80-add-w25q32-chip-support.patch
@@ -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, },