95609a6cb3
Archer C7 V2.0 units from December 2015 onwards ( serials starting 215C ) have changed flash chips to the gd25q128 chip, this is supported in trunk but not presently in 15.05. I would like stable support for this version so I've back ported the required fix from trunk and removed a conflicting patch from bcm53xx I've tested the patch it and I'm able to install a build of 15.05.1 on a new Archer C7 device with this patch. Signed-off-by: John Marrett <johnf@zioncluster.ca> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49220
11 lines
387 B
Diff
11 lines
387 B
Diff
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -963,6 +963,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
|
|
JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
|
|
+ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX ||
|
|
JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
|
|
write_enable(nor);
|
|
write_sr(nor, 0);
|