From: Matthias Schiffer Date: Tue, 9 Jan 2018 20:41:48 +0100 Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with Winbond)" This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e. The underlying issue breaking Spansion flash has been fixed with "mtd: spi-nor: wait until lock/unlock operations are ready" and "mtd: spi-nor: wait for SR_WIP to clear on initial unlock", so we can support unlocking for Winbond flash again. Signed-off-by: Matthias Schiffer --- drivers/mtd/spi-nor/spi-nor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- 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 static void winbond_set_default_init(struct spi_nor *nor) { + nor->flags |= SNOR_F_HAS_LOCK; nor->params.set_4byte = winbond_set_4byte; } @@ -4888,6 +4889,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) nor->clear_sr_bp = spi_nor_clear_sr_bp;