diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-08-31 20:06:38 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-08-31 20:06:38 +0000 |
| commit | 7782fcf8746bd43f5815432a6bde8471793ffa27 (patch) | |
| tree | cc82ac58befdc1b3b41b376b46f5a32cf13bc8ef /target/linux/generic/patches-2.6.34 | |
| parent | 19654fd1c26e8f54fdd15734df1dbbd2a3d185e3 (diff) | |
| download | mtk-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.34')
4 files changed, 37 insertions, 11 deletions
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 96a5bd0..3c014aa 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 9235e6e..99131c5 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 69c595e..2def379 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 34dfdbd..ce8b6d3 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) }, |