74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
15 lines
473 B
Diff
15 lines
473 B
Diff
Disable software protection bits for Macronix flashes.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -1166,6 +1166,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
|
|
JEDEC_MFR(info) == SNOR_MFR_INTEL ||
|
|
+ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
|
|
JEDEC_MFR(info) == SNOR_MFR_SST ||
|
|
info->flags & SPI_NOR_HAS_LOCK) {
|
|
write_enable(nor);
|