|
|
@@ -1,14 +1,14 @@
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
|
-@@ -1092,6 +1092,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) },
|
|
|
+@@ -1094,6 +1094,7 @@ static const struct flash_info spi_nor_i
|
|
|
+ { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256,
|
|
|
+ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
|
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
|
|
+ { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
|
|
|
{ "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) },
|
|
|
-@@ -1274,11 +1275,12 @@ static const struct flash_info spi_nor_i
|
|
|
+@@ -1276,11 +1277,12 @@ static const struct flash_info spi_nor_i
|
|
|
{ },
|
|
|
};
|
|
|
|
|
|
@@ -23,7 +23,7 @@
|
|
|
|
|
|
tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
|
|
|
if (tmp < 0) {
|
|
|
-@@ -1289,10 +1291,16 @@ static const struct flash_info *spi_nor_
|
|
|
+@@ -1291,10 +1293,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) {
|
|
|
@@ -42,7 +42,7 @@
|
|
|
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
|
|
|
id[0], id[1], id[2]);
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
-@@ -2826,7 +2834,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
+@@ -2828,7 +2836,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)
|
|
|
@@ -51,7 +51,7 @@
|
|
|
if (IS_ERR_OR_NULL(info))
|
|
|
return -ENOENT;
|
|
|
|
|
|
-@@ -2837,7 +2845,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
+@@ -2839,7 +2847,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
|
|
if (name && info->id_len) {
|
|
|
const struct flash_info *jinfo;
|
|
|
|