aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-08 22:19:31 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-08 22:19:31 +0000
commit8dbed04ec9cad7771590af557b9edfe8e04bca8c (patch)
tree412beb5055a726a8f371c35580bdc85300e4e2f7 /target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
parentc38cb63808ff1a395dd0384af23773b044adf9cb (diff)
downloadupstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.gz
upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.bz2
upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.zip
kernel: add support for 3.8-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 35055
Diffstat (limited to 'target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
-rw-r--r--target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
new file mode 100644
index 0000000000..ba1526ce52
--- /dev/null
+++ b/target/linux/generic/patches-3.8/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch
@@ -0,0 +1,41 @@
+--- a/drivers/mtd/devices/Kconfig
++++ b/drivers/mtd/devices/Kconfig
+@@ -110,6 +110,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 {
+@@ -913,7 +919,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) {