aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-04-16 18:31:05 +0000
commitc19a05ddc769a8b14837218fea04fe8b5c887eee (patch)
treed0285c3b8b16f40ed39ca88a77e257f6443ecb57 /target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch
parent80a4ffa1e2bc5f3ef893251babb2371c502f04ad (diff)
downloadmaster-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.gz
master-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.tar.bz2
master-187ad058-c19a05ddc769a8b14837218fea04fe8b5c887eee.zip
kernel: reorganize 2.6.39 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26691 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch
deleted file mode 100644
index ae4f922190..0000000000
--- a/target/linux/generic/patches-2.6.39/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -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 */
-
-@@ -617,6 +618,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) \
-@@ -675,6 +677,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).
- */
-@@ -897,6 +903,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;