diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
| commit | 2d49e32715b05280e6f6e3e0c0140f3a7423b951 (patch) | |
| tree | 4e72504855796fdf4c3bbb48da4e10e66a35ccb8 /target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch | |
| parent | ad1c38fe97958d5b6f1545c4e5ef12022f95b8e7 (diff) | |
| download | upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.gz upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.bz2 upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.zip | |
generic/3.10: rename mtd patches
- change patch numbers to group the related stuff together,
- add mtd prefix where it is missing,
- use hyphens in the patch names
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37974
Diffstat (limited to 'target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch new file mode 100644 index 0000000000..971c9ed8b6 --- /dev/null +++ b/target/linux/generic/patches-3.10/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch @@ -0,0 +1,41 @@ +--- a/drivers/mtd/devices/Kconfig ++++ b/drivers/mtd/devices/Kconfig +@@ -109,6 +109,14 @@ config MTD_SPEAR_SMI + help + This enable SNOR support on SPEAR platforms using SMI controller + ++config M25PXX_PREFER_SMALL_SECTOR_ERASE ++ bool "Prefer small sector erase" ++ depends on MTD_M25P80 ++ default y ++ help ++ This option enables use of the small erase sectors if that is ++ supported by the flash chip. ++ + config MTD_SST25L + tristate "Support SST25L (non JEDEC) SPI Flash chips" + depends on SPI_MASTER +--- a/drivers/mtd/devices/m25p80.c ++++ b/drivers/mtd/devices/m25p80.c +@@ -76,6 +76,12 @@ + + #define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16) + ++#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE ++#define PREFER_SMALL_SECTOR_ERASE 1 ++#else ++#define PREFER_SMALL_SECTOR_ERASE 0 ++#endif ++ + /****************************************************************************/ + + struct m25p { +@@ -1021,7 +1027,7 @@ static int m25p_probe(struct spi_device + flash->mtd._write = m25p80_write; + + /* prefer "small sector" erase if possible */ +- if (info->flags & SECT_4K) { ++ if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) { + flash->erase_opcode = OPCODE_BE_4K; + flash->mtd.erasesize = 4096; + } else if (info->flags & SECT_4K_PMC) { |