diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-26 16:40:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-26 16:40:11 +0000 |
| commit | 6693c636f40ea19e92a59bfdd4db9fb9b6e2707f (patch) | |
| tree | 8c406ce5917a39b093fa2dd5082e7d42b23d97be /target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch | |
| parent | 88732aeef750b2d33bf41b60d1dfa05211b33266 (diff) | |
| download | master-187ad058-6693c636f40ea19e92a59bfdd4db9fb9b6e2707f.tar.gz master-187ad058-6693c636f40ea19e92a59bfdd4db9fb9b6e2707f.tar.bz2 master-187ad058-6693c636f40ea19e92a59bfdd4db9fb9b6e2707f.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47664 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 dcf594bad1..e977e41a4b 100644 --- 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); |