aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-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
-rw-r--r--target/linux/generic/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch32
-rw-r--r--target/linux/generic/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch6
-rw-r--r--target/linux/generic/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch8
-rw-r--r--target/linux/generic/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch2
-rw-r--r--target/linux/generic/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch32
-rw-r--r--target/linux/generic/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch6
-rw-r--r--target/linux/generic/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch8
-rw-r--r--target/linux/generic/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch2
-rw-r--r--target/linux/generic/patches-2.6.35/084-mtd_m25p80_add_pm25lv_flash_support.patch32
-rw-r--r--target/linux/generic/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch6
-rw-r--r--target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch8
-rw-r--r--target/linux/generic/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch2
-rw-r--r--target/linux/generic/patches-2.6.36/084-mtd_m25p80_add_pm25lv_flash_support.patch32
-rw-r--r--target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch6
18 files changed, 180 insertions, 50 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 ce70690182..1e31e3bc85 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 21555848ef..348e390e26 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 83d5cddf18..16c21aa586 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 5f44c1d696..75425d2bc5 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, },
diff --git a/target/linux/generic/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 54cc6bbe50..39b91fe008 100644
--- a/target/linux/generic/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -1,13 +1,39 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
+@@ -40,6 +40,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 */
+
+@@ -599,6 +600,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) \
+@@ -645,6 +647,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).
*/
+@@ -857,6 +863,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;
diff --git a/target/linux/generic/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
index 607430bb2d..2388580599 100644
--- a/target/linux/generic/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i
+@@ -647,6 +647,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) },
@@ -9,5 +9,5 @@
+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 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) },
diff --git a/target/linux/generic/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
index fc20871fa4..88b327c3f4 100644
--- a/target/linux/generic/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
+@@ -651,6 +651,11 @@ static const struct spi_device_id m25p_i
{ "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) },
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
@@ -10,9 +10,9 @@
+ { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 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) },
-@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
+ { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+ { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
+@@ -835,11 +840,12 @@ static int __devinit m25p_probe(struct s
dev_set_drvdata(&spi->dev, flash);
/*
diff --git a/target/linux/generic/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
index 8d32ec2c5e..d58166a0aa 100644
--- a/target/linux/generic/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.33/087-mtd-m25p80-add-w25q32-chip-support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -706,6 +706,7 @@ static const struct spi_device_id m25p_i
+@@ -708,6 +708,7 @@ static const struct spi_device_id m25p_i
{ "w25x80", INFO(0xef3014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) },
{ "w25x32", INFO(0xef3016, 0, 64 * 1024, 64, SECT_4K) },
diff --git a/target/linux/generic/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 96a5bd0132..3c014aa4c2 100644
--- a/target/linux/generic/patches-2.6.34/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-2.6.34/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;
diff --git a/target/linux/generic/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
index 9235e6ee16..99131c5c0a 100644
--- a/target/linux/generic/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic/patches-2.6.34/085-mtd_m25p80_add_en25pxx_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+@@ -648,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) },
@@ -9,5 +9,5 @@
+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 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) },
diff --git a/target/linux/generic/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
index 69c595e0a0..2def3794ea 100644
--- a/target/linux/generic/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
+@@ -652,6 +652,11 @@ static const struct spi_device_id m25p_i
{ "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) },
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
@@ -10,9 +10,9 @@
+ { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 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) },
-@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
+ { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+ { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
+@@ -836,11 +841,12 @@ static int __devinit m25p_probe(struct s
dev_set_drvdata(&spi->dev, flash);
/*
diff --git a/target/linux/generic/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
index 34dfdbd894..ce8b6d3adc 100644
--- a/target/linux/generic/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.34/087-mtd-m25p80-add-w25q32-chip-support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -707,6 +707,7 @@ static const struct spi_device_id m25p_i
+@@ -709,6 +709,7 @@ static const struct spi_device_id m25p_i
{ "w25x80", INFO(0xef3014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) },
{ "w25x32", INFO(0xef3016, 0, 64 * 1024, 64, SECT_4K) },
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 96a5bd0132..3c014aa4c2 100644
--- 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;
diff --git a/target/linux/generic/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
index 9235e6ee16..99131c5c0a 100644
--- a/target/linux/generic/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic/patches-2.6.35/085-mtd_m25p80_add_en25pxx_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+@@ -648,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) },
@@ -9,5 +9,5 @@
+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 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) },
diff --git a/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
index 69c595e0a0..2def3794ea 100644
--- a/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic/patches-2.6.35/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i
+@@ -652,6 +652,11 @@ static const struct spi_device_id m25p_i
{ "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) },
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
@@ -10,9 +10,9 @@
+ { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 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) },
-@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s
+ { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
+ { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
+@@ -836,11 +841,12 @@ static int __devinit m25p_probe(struct s
dev_set_drvdata(&spi->dev, flash);
/*
diff --git a/target/linux/generic/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/generic/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
index 34dfdbd894..ce8b6d3adc 100644
--- a/target/linux/generic/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.35/087-mtd-m25p80-add-w25q32-chip-support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -707,6 +707,7 @@ static const struct spi_device_id m25p_i
+@@ -709,6 +709,7 @@ static const struct spi_device_id m25p_i
{ "w25x80", INFO(0xef3014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) },
{ "w25x32", INFO(0xef3016, 0, 64 * 1024, 64, SECT_4K) },
diff --git a/target/linux/generic/patches-2.6.36/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.36/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 96a5bd0132..e37bab77e8 100644
--- a/target/linux/generic/patches-2.6.36/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic/patches-2.6.36/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
+@@ -43,6 +43,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 */
+
+@@ -598,6 +599,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) \
+@@ -654,6 +656,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).
*/
+@@ -869,6 +875,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;
diff --git a/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch
index 9235e6ee16..df2974cc0a 100644
--- a/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -646,6 +646,10 @@ static const struct spi_device_id m25p_i
+@@ -656,6 +656,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) },
@@ -9,5 +9,5 @@
+ { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 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) },