kernel: Set SNOR_F_HAS_LOCK also for Winbond NOR flashes

[openwrt/staging/blogic.git] / target / linux / generic / pending-5.4 / 466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch

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 7cdfa6b1b7cc11ed756253fb552363c2a49f6b4d..c5db43b5e632ca9d9b5c4d0550935f8ab2a57a1a 100644 (file)
--- 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,15 @@ 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
-@@ -4886,6 +4886,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -4397,6 +4397,7 @@ static void st_micron_set_default_init(s
+ 
+ static void winbond_set_default_init(struct spi_nor *nor)
+ {
++      nor->flags |= SNOR_F_HAS_LOCK;
+       nor->params.set_4byte = winbond_set_4byte;
+ }
+ 
+@@ -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 ||