mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +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>
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
|
|
@@ -4884,6 +4884,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;
|