|
|
@@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <[email protected]>
|
|
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
|
-@@ -2737,6 +2737,7 @@ static int spi_nor_init(struct spi_nor *
|
|
|
+@@ -2739,6 +2739,7 @@ static int spi_nor_init(struct spi_nor *
|
|
|
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
|
|
|
JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
|
|
|
JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
|
|
|
@@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <[email protected]>
|
|
|
nor->info->flags & SPI_NOR_HAS_LOCK) {
|
|
|
write_enable(nor);
|
|
|
write_sr(nor, 0);
|
|
|
-@@ -2873,7 +2874,8 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
+@@ -2875,7 +2876,8 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
|
|
/* NOR protection support for STmicro/Micron chips and similar */
|
|
|
if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
|