mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
667f6c7f49
Manually rebased patches:
bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch
generic-backport/744-v5.5-net-sfp-soft-status-and-control-support.patch
layerscape/patches-5.4/819-uart-0005-tty-serial-fsl_lpuart-enable-dma-mode-for-imx8qxp.patch
mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
Removed:
layerscape/patches-5.4/819-uart-0012-tty-serial-lpuart-add-LS1028A-support.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
lantiq/Easybox 904 xDSL, x86_64
Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL, x86_64
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Co-developed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
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
|
|
@@ -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;
|
|
}
|
|
|
|
@@ -4885,6 +4886,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;
|
|
|