kernel: revert a faulty upstream commit that was added with the spi-nor/m25p80 backpo...

[openwrt/openwrt.git] / target / linux / generic / patches-4.1 / 465-m25p80-mx-disable-software-protection.patch

diff --git a/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
index dcf594bad12b313f7f40de9bf61deec0cac9fe3b..e977e41a4b450be63144282483cf118b4f7ca453 100644 (file)
--- a/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
@@ -9,6 +9,6 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        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 ||
-           JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
+           JEDEC_MFR(info) == SNOR_MFR_SST) {
                write_enable(nor);
+               write_sr(nor, 0);