mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
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 <mschiffer@universe-factory.net>
|
|
---
|
|
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
|
|
@@ -4398,6 +4398,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 ||
|
|
+ JEDEC_MFR(nor->info) == SNOR_MFR_WINBOND ||
|
|
nor->info->flags & SPI_NOR_HAS_LOCK)
|
|
nor->clear_sr_bp = spi_nor_clear_sr_bp;
|
|
|