target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch

   1 From: Matthias Schiffer <mschiffer@universe-factory.net>
   2 Date: Tue, 9 Jan 2018 20:41:48 +0100
   3 Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with
   4  Winbond)"
   5
   6 This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e.
   7
   8 The underlying issue breaking Spansion flash has been fixed with "mtd: spi-nor:
   9 wait until lock/unlock operations are ready" and "mtd: spi-nor: wait for SR_WIP
  10 to clear on initial unlock", so we can support unlocking for Winbond flash
  11 again.
  12
  13 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  14 ---
  15  drivers/mtd/spi-nor/spi-nor.c | 4 +++-
  16  1 file changed, 3 insertions(+), 1 deletion(-)
  17
  18 --- a/drivers/mtd/spi-nor/spi-nor.c
  19 +++ b/drivers/mtd/spi-nor/spi-nor.c
  20 @@ -2710,6 +2710,7 @@ int spi_nor_scan(struct spi_nor *nor, co
  21             JEDEC_MFR(info) == SNOR_MFR_INTEL ||
  22             JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
  23             JEDEC_MFR(info) == SNOR_MFR_SST ||
  24 +           JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
  25             info->flags & SPI_NOR_HAS_LOCK) {
  26                 write_enable(nor);
  27                 write_sr(nor, 0);
  28 @@ -2728,7 +2729,8 @@ int spi_nor_scan(struct spi_nor *nor, co
  29
  30         /* NOR protection support for STmicro/Micron chips and similar */
  31         if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
  32 -                       info->flags & SPI_NOR_HAS_LOCK) {
  33 +           JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
  34 +           info->flags & SPI_NOR_HAS_LOCK) {
  35                 nor->flash_lock = stm_lock;
  36                 nor->flash_unlock = stm_unlock;
  37                 nor->flash_is_locked = stm_is_locked;