diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-04-11 10:28:14 +0000 |
| commit | 88655056656fdbd9d021d8de11a6077fb49428da (patch) | |
| tree | d3b641c3c5876ee5e79c67034a95a8fd532a4077 /target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch | |
| parent | b66b0ae6323fea7dedd400785c556a39a30cdf4f (diff) | |
| download | upstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.gz upstream-88655056656fdbd9d021d8de11a6077fb49428da.tar.bz2 upstream-88655056656fdbd9d021d8de11a6077fb49428da.zip | |
generic: drop 3.14
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 45375
Diffstat (limited to 'target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch deleted file mode 100644 index eec90fa413..0000000000 --- a/target/linux/generic/patches-3.14/471-mtd-m25p80-allow-to-disable-small-sector-erase.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/drivers/mtd/devices/Kconfig -+++ b/drivers/mtd/devices/Kconfig -@@ -102,6 +102,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 -@@ -90,6 +90,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 -+ - /****************************************************************************/ - - enum read_type { -@@ -1192,7 +1198,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) { |