mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +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>
19 lines
638 B
Diff
19 lines
638 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: Disable software protection bits for Macronix flashes.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -4883,6 +4883,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
*/
|
|
if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL ||
|
|
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
|
|
+ JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
|
|
JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
|
|
nor->info->flags & SPI_NOR_HAS_LOCK)
|
|
nor->clear_sr_bp = spi_nor_clear_sr_bp;
|