kernel: make make patches/files apply/compile for kernel 5.2

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

diff --git a/target/linux/generic/pending-5.2/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/pending-5.2/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
index c6931f6014149d8313d4eb677883c84eb61cb909..46423590fd648c56ae6d7a4b556c8971282dddaa 100644 (file)
--- a/target/linux/generic/pending-5.2/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
+++ b/target/linux/generic/pending-5.2/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
@@ -17,15 +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
-@@ -3918,6 +3918,7 @@ static int spi_nor_init(struct spi_nor *
+@@ -4142,6 +4142,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 ||
 +          JEDEC_MFR(nor->info) == SNOR_MFR_WINBOND ||
-           nor->info->flags & SPI_NOR_HAS_LOCK) {
-               write_enable(nor);
-               write_sr(nor, 0);
-@@ -4065,6 +4066,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+           nor->info->flags & SPI_NOR_HAS_LOCK)
+               nor->clear_sr_bp = spi_nor_clear_sr_bp;
+ 
+@@ -4164,6 +4165,7 @@ int spi_nor_scan(struct spi_nor *nor, co
        /* NOR protection support for STmicro/Micron chips and similar */
        if (JEDEC_MFR(info) == SNOR_MFR_ST ||
            JEDEC_MFR(info) == SNOR_MFR_MICRON ||