aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-03-01 08:14:49 +0000
committerJohn Crispin <blogic@openwrt.org>2016-03-01 08:14:49 +0000
commit765d0e4a098112b34e1023b4fe486d6c2ee13a3c (patch)
treead350217993cde48c8ca51aa0d85faf8aaa3ecd4 /target/linux/generic/patches-3.18
parent8871ec8c28a77e791fc8dd530edb904b25f6fc77 (diff)
downloadupstream-765d0e4a098112b34e1023b4fe486d6c2ee13a3c.tar.gz
upstream-765d0e4a098112b34e1023b4fe486d6c2ee13a3c.tar.bz2
upstream-765d0e4a098112b34e1023b4fe486d6c2ee13a3c.zip
kernel: disable software protection bits for macronix flash chips at init
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport r47626 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48849 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18')
-rw-r--r--target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
new file mode 100644
index 0000000000..d7d7eeccc3
--- /dev/null
+++ b/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
@@ -0,0 +1,10 @@
+--- a/drivers/mtd/spi-nor/spi-nor.c
++++ b/drivers/mtd/spi-nor/spi-nor.c
+@@ -962,6 +962,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+
+ if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
++ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX ||
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
+ write_enable(nor);
+ write_sr(nor, 0);