diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
| commit | c0435a971e9c21ebf694b221717e7a73f12662ec (patch) | |
| tree | 6daa92bd257c9376af180e7bb3649dca91589812 /target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | |
| parent | 87203c404996884334a9584fce0d8a251bf9fb43 (diff) | |
| download | upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.gz upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.bz2 upstream-c0435a971e9c21ebf694b221717e7a73f12662ec.zip | |
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36663
Diffstat (limited to 'target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/476-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/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch new file mode 100644 index 0000000000..726c1eb1e8 --- /dev/null +++ b/target/linux/generic/patches-3.10/476-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 { +@@ -1022,7 +1028,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) { |