kernel: revert a faulty upstream commit that was added with the spi-nor/m25p80 backport (fixes #20971)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47664
This commit is contained in:
Felix Fietkau
2015-11-26 16:40:11 +00:00
parent 963fc89df2
commit b44a27885f
4 changed files with 74 additions and 4 deletions

View File

@@ -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);