aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-18 15:22:24 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-18 15:22:26 +0200
commitb8a129638ed46be7103e1043e2753ddbcb554baa (patch)
tree13c6163f64e2c569e64bbbb93167f23e23b969b1 /target/linux
parent21b04c623ecf901412c15b88d84ee75ec6064a35 (diff)
downloadupstream-b8a129638ed46be7103e1043e2753ddbcb554baa.tar.gz
upstream-b8a129638ed46be7103e1043e2753ddbcb554baa.tar.bz2
upstream-b8a129638ed46be7103e1043e2753ddbcb554baa.zip
kernel: add back the macronix software protection disable patch
It was accidentally left out when 4.4 support was added Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
new file mode 100644
index 0000000000..cc2103b2e8
--- /dev/null
+++ b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
@@ -0,0 +1,14 @@
+Disable software protection bits for Macronix flashes.
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+--- a/drivers/mtd/spi-nor/spi-nor.c
++++ b/drivers/mtd/spi-nor/spi-nor.c
+@@ -1156,6 +1156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+
+ if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
+ JEDEC_MFR(info) == SNOR_MFR_INTEL ||
++ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
+ JEDEC_MFR(info) == SNOR_MFR_SST) {
+ write_enable(nor);
+ write_sr(nor, 0);