OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 15... Line 15...
15 drivers/mtd/spi-nor/spi-nor.c | 4 +++- 15 drivers/mtd/spi-nor/spi-nor.c | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-) 16 1 file changed, 3 insertions(+), 1 deletion(-)
Line 17... Line 17...
17   17  
18 --- a/drivers/mtd/spi-nor/spi-nor.c 18 --- a/drivers/mtd/spi-nor/spi-nor.c
19 +++ b/drivers/mtd/spi-nor/spi-nor.c 19 +++ b/drivers/mtd/spi-nor/spi-nor.c
20 @@ -1603,6 +1603,7 @@ int spi_nor_scan(struct spi_nor *nor, co 20 @@ -1597,6 +1597,7 @@ int spi_nor_scan(struct spi_nor *nor, co
21 JEDEC_MFR(info) == SNOR_MFR_INTEL || 21 JEDEC_MFR(info) == SNOR_MFR_INTEL ||
22 JEDEC_MFR(info) == SNOR_MFR_MACRONIX || 22 JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
23 JEDEC_MFR(info) == SNOR_MFR_SST || 23 JEDEC_MFR(info) == SNOR_MFR_SST ||
24 + JEDEC_MFR(info) == SNOR_MFR_WINBOND || 24 + JEDEC_MFR(info) == SNOR_MFR_WINBOND ||
25 info->flags & SPI_NOR_HAS_LOCK) { 25 info->flags & SPI_NOR_HAS_LOCK) {
26 write_enable(nor); 26 write_enable(nor);
27 write_sr(nor, 0); 27 write_sr(nor, 0);
Line 28... Line 28...
28 @@ -1621,7 +1622,8 @@ int spi_nor_scan(struct spi_nor *nor, co 28 @@ -1615,7 +1616,8 @@ int spi_nor_scan(struct spi_nor *nor, co
29 29
30 /* NOR protection support for STmicro/Micron chips and similar */ 30 /* NOR protection support for STmicro/Micron chips and similar */
31 if (JEDEC_MFR(info) == SNOR_MFR_MICRON || 31 if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||