target/linux/ipq40xx/patches-4.14/303-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch

   1 Index: linux-4.14.50/drivers/mtd/spi-nor/spi-nor.c
   2 ===================================================================
   3 --- linux-4.14.50.orig/drivers/mtd/spi-nor/spi-nor.c
   4 +++ linux-4.14.50/drivers/mtd/spi-nor/spi-nor.c
   5 @@ -1025,6 +1025,7 @@ static const struct flash_info spi_nor_i
   6         { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
   7         { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
   8         { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
   9 +       { "mx25l25635f", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) },
  10         { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
  11         { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
  12         { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
  13 @@ -1189,11 +1190,12 @@ static const struct flash_info spi_nor_i
  14         { },
  15  };
  16
  17 -static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
  18 +static const struct flash_info *spi_nor_read_id(struct spi_nor *nor,
  19 +                                               const char *name)
  20  {
  21         int                     tmp;
  22         u8                      id[SPI_NOR_MAX_ID_LEN];
  23 -       const struct flash_info *info;
  24 +       const struct flash_info *info, *first_match = NULL;
  25
  26         tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
  27         if (tmp < 0) {
  28 @@ -1204,10 +1206,16 @@ static const struct flash_info *spi_nor_
  29         for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
  30                 info = &spi_nor_ids[tmp];
  31                 if (info->id_len) {
  32 -                       if (!memcmp(info->id, id, info->id_len))
  33 -                               return &spi_nor_ids[tmp];
  34 +                       if (!memcmp(info->id, id, info->id_len)) {
  35 +                               if (!name || !strcmp(name, info->name))
  36 +                                       return info;
  37 +                               if (!first_match)
  38 +                                       first_match = info;
  39 +                       }
  40                 }
  41         }
  42 +       if (first_match)
  43 +               return first_match;
  44         dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
  45                 id[0], id[1], id[2]);
  46         return ERR_PTR(-ENODEV);
  47 @@ -2667,7 +2675,7 @@ int spi_nor_scan(struct spi_nor *nor, co
  48                 info = spi_nor_match_id(name);
  49         /* Try to auto-detect if chip name wasn't specified or not found */
  50         if (!info)
  51 -               info = spi_nor_read_id(nor);
  52 +               info = spi_nor_read_id(nor, NULL);
  53         if (IS_ERR_OR_NULL(info))
  54                 return -ENOENT;
  55
  56 @@ -2678,7 +2686,7 @@ int spi_nor_scan(struct spi_nor *nor, co
  57         if (name && info->id_len) {
  58                 const struct flash_info *jinfo;
  59
  60 -               jinfo = spi_nor_read_id(nor);
  61 +               jinfo = spi_nor_read_id(nor, name);
  62                 if (IS_ERR(jinfo)) {
  63                         return PTR_ERR(jinfo);
  64                 } else if (jinfo != info) {