From b44a27885ff6e18f7a2ac03f4bfbb5dd23fee0d4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 26 Nov 2015 16:40:11 +0000 Subject: kernel: revert a faulty upstream commit that was added with the spi-nor/m25p80 backport (fixes #20971) Signed-off-by: Felix Fietkau SVN-Revision: 47664 --- .../patches-4.3/465-m25p80-mx-disable-software-protection.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-4.3/465-m25p80-mx-disable-software-protection.patch') diff --git a/target/linux/generic/patches-4.3/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.3/465-m25p80-mx-disable-software-protection.patch index dcf594bad1..e977e41a4b 100644 --- a/target/linux/generic/patches-4.3/465-m25p80-mx-disable-software-protection.patch +++ b/target/linux/generic/patches-4.3/465-m25p80-mx-disable-software-protection.patch @@ -9,6 +9,6 @@ Signed-off-by: Felix Fietkau 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); -- cgit v1.2.3