|
|
|
@ -10,7 +10,7 @@ For reference see:
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
|
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
|
|
|
@@ -1098,6 +1098,7 @@ static const struct flash_info spi_nor_i
|
|
|
|
|
@@ -1103,6 +1103,7 @@ static const struct flash_info spi_nor_i
|
|
|
|
|
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
|
|
|
|
|
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
|
|
|
|
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
|
|
@ -18,7 +18,7 @@ For reference see:
|
|
|
|
|
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
|
|
|
|
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
|
|
|
|
{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
|
|
|
|
|
@@ -1267,11 +1268,12 @@ static const struct flash_info spi_nor_i
|
|
|
|
|
@@ -1272,11 +1273,12 @@ static const struct flash_info spi_nor_i
|
|
|
|
|
{ },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -33,7 +33,7 @@ For reference see:
|
|
|
|
|
|
|
|
|
|
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
|
|
|
|
|
if (tmp < 0) {
|
|
|
|
|
@@ -1282,10 +1284,16 @@ static const struct flash_info *spi_nor_
|
|
|
|
|
@@ -1287,10 +1289,16 @@ static const struct flash_info *spi_nor_
|
|
|
|
|
for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
|
|
|
|
|
info = &spi_nor_ids[tmp];
|
|
|
|
|
if (info->id_len) {
|
|
|
|
@ -52,7 +52,7 @@ For reference see:
|
|
|
|
|
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
|
|
|
|
id[0], id[1], id[2]);
|
|
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
|
@@ -2765,7 +2773,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
|
@@ -2770,7 +2778,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
|
info = spi_nor_match_id(name);
|
|
|
|
|
/* Try to auto-detect if chip name wasn't specified or not found */
|
|
|
|
|
if (!info)
|
|
|
|
@ -61,7 +61,7 @@ For reference see:
|
|
|
|
|
if (IS_ERR_OR_NULL(info))
|
|
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
|
|
@@ -2776,7 +2784,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
|
@@ -2781,7 +2789,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
|
|
if (name && info->id_len) {
|
|
|
|
|
const struct flash_info *jinfo;
|
|
|
|
|
|
|
|
|
|