aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
diff options
context:
space:
mode:
authorChuanhong Guo <gch981213@gmail.com>2020-04-04 21:23:50 +0800
committerChuanhong Guo <gch981213@gmail.com>2020-04-05 12:07:47 +0800
commitf0f35fdac19b4d3e40aa03928cbbac15a83837bf (patch)
treecdf856f90fd06d0d00aef856f306b92c801d79ef /target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
parentd24e43a7f622a8033f3703027fb19a617ae7aa02 (diff)
downloadupstream-f0f35fdac19b4d3e40aa03928cbbac15a83837bf.tar.gz
upstream-f0f35fdac19b4d3e40aa03928cbbac15a83837bf.tar.bz2
upstream-f0f35fdac19b4d3e40aa03928cbbac15a83837bf.zip
Revert "generic: 5.4: Add 4B_OPCODES flag to w25q256"
This reverts commit d7f21940bcaf70ba404d354c7fa6519c1717d00a. Winbond W25Q256FV and W25Q256JV both uses 0xef4019 as JEDEC ID, but only the latter has proper 4B_OPCODES support. W25Q256FV has all 4B read instructions but it lacks a 4B page program instruction, causing the entire flash to be read-only. Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch')
-rw-r--r--target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
index 8b8cfd0cec..c5db43b5e6 100644
--- a/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+++ b/target/linux/generic/pending-5.4/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -4399,6 +4399,7 @@ static void st_micron_set_default_init(s
+@@ -4397,6 +4397,7 @@ static void st_micron_set_default_init(s
static void winbond_set_default_init(struct spi_nor *nor)
{
@@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
nor->params.set_4byte = winbond_set_4byte;
}
-@@ -4888,6 +4889,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -4886,6 +4887,7 @@ int spi_nor_scan(struct spi_nor *nor, co
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
JEDEC_MFR(nor->info) == SNOR_MFR_SST ||