INFO macro make flash table entries more adjustable like
adding new flash_info attributes, update ID length bytes
and so on and more over it will sync to Linux way of defining
flash_info attributes.

Cc: Simon Glass <s...@chromium.org>
Cc: Bin Meng <bmeng...@gmail.com>
Cc: York Sun <york....@nxp.com>
Cc: Vignesh R <vigne...@ti.com>
Cc: Mugunthan V N <mugunthan...@ti.com>
Cc: Michal Simek <michal.si...@xilinx.com>
Cc: Siva Durga Prasad Paladugu <siva...@xilinx.com>
Signed-off-by: Jagan Teki <jt...@openedev.com>
---
 drivers/mtd/spi/sf_internal.h |  15 ++-
 drivers/mtd/spi/sf_params.c   | 215 ++++++++++++++++++++++--------------------
 drivers/mtd/spi/spi_flash.c   |  61 ++++++------
 include/linux/err.h           |   5 +
 4 files changed, 160 insertions(+), 136 deletions(-)

diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
index e5c38bf..3f20b67 100644
--- a/drivers/mtd/spi/sf_internal.h
+++ b/drivers/mtd/spi/sf_internal.h
@@ -107,8 +107,6 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, 
size_t len,
  * struct spi_flash_params - SPI/QSPI flash device params structure
  *
  * @name:              Device name ([MANUFLETTER][DEVTYPE][DENSITY][EXTRAINFO])
- * @jedec:             Device jedec ID (0x[1byte_manuf_id][2byte_dev_id])
- * @ext_jedec:         Device ext_jedec ID
  * @sector_size:       Isn't necessarily a sector size from vendor,
  *                     the size listed here is what works with CMD_ERASE_64K
  * @nr_sectors:                No.of sectors on this device
@@ -116,11 +114,20 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, 
size_t len,
  */
 struct spi_flash_params {
        const char *name;
-       u32 jedec;
-       u16 ext_jedec;
+
+       /*
+        * This array stores the ID bytes.
+        * The first three bytes are the JEDIC ID.
+        * JEDEC ID zero means "no ID" (mostly older chips).
+        */
+       u8              id[5];
+       u8              id_len;
+
        u32 sector_size;
        u32 nr_sectors;
 
+       u16 page_size;
+
        u16 flags;
 #define SECT_4K                BIT(0)
 #define E_FSR                  BIT(1)
diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
index 5b50114..70d9e18 100644
--- a/drivers/mtd/spi/sf_params.c
+++ b/drivers/mtd/spi/sf_params.c
@@ -12,125 +12,140 @@
 
 #include "sf_internal.h"
 
+/* Used when the "_ext_id" is two bytes at most */
+#define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags)     \
+               .id = {                                                 \
+                       ((_jedec_id) >> 16) & 0xff,                     \
+                       ((_jedec_id) >> 8) & 0xff,                      \
+                       (_jedec_id) & 0xff,                             \
+                       ((_ext_id) >> 8) & 0xff,                        \
+                       (_ext_id) & 0xff,                               \
+                       },                                              \
+               .id_len = (!(_jedec_id) ? 0 : (3 + ((_ext_id) ? 2 : 0))),       
\
+               .sector_size = (_sector_size),                          \
+               .nr_sectors = (_n_sectors),                             \
+               .page_size = 256,                                       \
+               .flags = (_flags),
+
 /* SPI/QSPI flash device params structure */
 const struct spi_flash_params spi_flash_params_table[] = {
 #ifdef CONFIG_SPI_FLASH_ATMEL          /* ATMEL */
-       {"AT45DB011D",     0x1f2200, 0x0,       64 * 1024,     4, SECT_4K},
-       {"AT45DB021D",     0x1f2300, 0x0,       64 * 1024,     8, SECT_4K},
-       {"AT45DB041D",     0x1f2400, 0x0,       64 * 1024,     8, SECT_4K},
-       {"AT45DB081D",     0x1f2500, 0x0,       64 * 1024,    16, SECT_4K},
-       {"AT45DB161D",     0x1f2600, 0x0,       64 * 1024,    32, SECT_4K},
-       {"AT45DB321D",     0x1f2700, 0x0,       64 * 1024,    64, SECT_4K},
-       {"AT45DB641D",     0x1f2800, 0x0,       64 * 1024,   128, SECT_4K},
-       {"AT25DF321A",     0x1f4701, 0x0,       64 * 1024,    64, SECT_4K},
-       {"AT25DF321",      0x1f4700, 0x0,       64 * 1024,    64, SECT_4K},
-       {"AT26DF081A",     0x1f4501, 0x0,       64 * 1024,    16, SECT_4K},
+       {"AT45DB011D",     INFO(0x1f2200, 0x0, 64 * 1024,     4, SECT_4K) },
+       {"AT45DB021D",     INFO(0x1f2300, 0x0, 64 * 1024,     8, SECT_4K) },
+       {"AT45DB041D",     INFO(0x1f2400, 0x0, 64 * 1024,     8, SECT_4K) },
+       {"AT45DB081D",     INFO(0x1f2500, 0x0, 64 * 1024,    16, SECT_4K) },
+       {"AT45DB161D",     INFO(0x1f2600, 0x0, 64 * 1024,    32, SECT_4K) },
+       {"AT45DB321D",     INFO(0x1f2700, 0x0, 64 * 1024,    64, SECT_4K) },
+       {"AT45DB641D",     INFO(0x1f2800, 0x0, 64 * 1024,   128, SECT_4K) },
+       {"AT25DF321A",     INFO(0x1f4701, 0x0, 64 * 1024,    64, SECT_4K) },
+       {"AT25DF321",      INFO(0x1f4700, 0x0, 64 * 1024,    64, SECT_4K) },
+       {"AT26DF081A",     INFO(0x1f4501, 0x0, 64 * 1024,    16, SECT_4K) },
 #endif
 #ifdef CONFIG_SPI_FLASH_EON            /* EON */
-       {"EN25Q32B",       0x1c3016, 0x0,       64 * 1024,    64, 0},
-       {"EN25Q64",        0x1c3017, 0x0,       64 * 1024,   128, SECT_4K},
-       {"EN25Q128B",      0x1c3018, 0x0,       64 * 1024,   256, 0},
-       {"EN25S64",        0x1c3817, 0x0,       64 * 1024,   128, 0},
+       {"EN25Q32B",       INFO(0x1c3016, 0x0, 64 * 1024,    64, 0) },
+       {"EN25Q64",        INFO(0x1c3017, 0x0, 64 * 1024,   128, SECT_4K) },
+       {"EN25Q128B",      INFO(0x1c3018, 0x0, 64 * 1024,   256, 0) },
+       {"EN25S64",        INFO(0x1c3817, 0x0, 64 * 1024,   128, 0) },
 #endif
 #ifdef CONFIG_SPI_FLASH_GIGADEVICE     /* GIGADEVICE */
-       {"GD25Q64B",       0xc84017, 0x0,       64 * 1024,   128, SECT_4K},
-       {"GD25LQ32",       0xc86016, 0x0,       64 * 1024,    64, SECT_4K},
+       {"GD25Q64B",       INFO(0xc84017, 0x0, 64 * 1024,   128, SECT_4K) },
+       {"GD25LQ32",       INFO(0xc86016, 0x0, 64 * 1024,    64, SECT_4K) },
 #endif
 #ifdef CONFIG_SPI_FLASH_ISSI           /* ISSI */
-       {"IS25LP032",      0x9d6016, 0x0,       64 * 1024,    64, 0},
-       {"IS25LP064",      0x9d6017, 0x0,       64 * 1024,   128, 0},
-       {"IS25LP128",      0x9d6018, 0x0,       64 * 1024,   256, 0},
+       {"IS25LP032",      INFO(0x9d6016, 0x0, 64 * 1024,    64, 0) },
+       {"IS25LP064",      INFO(0x9d6017, 0x0, 64 * 1024,   128, 0) },
+       {"IS25LP128",      INFO(0x9d6018, 0x0, 64 * 1024,   256, 0) },
 #endif
 #ifdef CONFIG_SPI_FLASH_MACRONIX       /* MACRONIX */
-       {"MX25L2006E",     0xc22012, 0x0,       64 * 1024,     4, 0},
-       {"MX25L4005",      0xc22013, 0x0,       64 * 1024,     8, 0},
-       {"MX25L8005",      0xc22014, 0x0,       64 * 1024,    16, 0},
-       {"MX25L1605D",     0xc22015, 0x0,       64 * 1024,    32, 0},
-       {"MX25L3205D",     0xc22016, 0x0,       64 * 1024,    64, 0},
-       {"MX25L6405D",     0xc22017, 0x0,       64 * 1024,   128, 0},
-       {"MX25L12805",     0xc22018, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"MX25L25635F",    0xc22019, 0x0,       64 * 1024,   512, RD_FULL | 
WR_QPP},
-       {"MX25L51235F",    0xc2201a, 0x0,       64 * 1024,  1024, RD_FULL | 
WR_QPP},
-       {"MX25L12855E",    0xc22618, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP},
+       {"MX25L2006E",     INFO(0xc22012, 0x0, 64 * 1024,     4, 0) },
+       {"MX25L4005",      INFO(0xc22013, 0x0, 64 * 1024,     8, 0) },
+       {"MX25L8005",      INFO(0xc22014, 0x0, 64 * 1024,    16, 0) },
+       {"MX25L1605D",     INFO(0xc22015, 0x0, 64 * 1024,    32, 0) },
+       {"MX25L3205D",     INFO(0xc22016, 0x0, 64 * 1024,    64, 0) },
+       {"MX25L6405D",     INFO(0xc22017, 0x0, 64 * 1024,   128, 0) },
+       {"MX25L12805",     INFO(0xc22018, 0x0, 64 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"MX25L25635F",    INFO(0xc22019, 0x0, 64 * 1024,   512, RD_FULL | 
WR_QPP) },
+       {"MX25L51235F",    INFO(0xc2201a, 0x0, 64 * 1024,  1024, RD_FULL | 
WR_QPP) },
+       {"MX25L12855E",    INFO(0xc22618, 0x0, 64 * 1024,   256, RD_FULL | 
WR_QPP) },
 #endif
 #ifdef CONFIG_SPI_FLASH_SPANSION       /* SPANSION */
-       {"S25FL008A",      0x010213, 0x0,       64 * 1024,    16, 0},
-       {"S25FL016A",      0x010214, 0x0,       64 * 1024,    32, 0},
-       {"S25FL032A",      0x010215, 0x0,       64 * 1024,    64, 0},
-       {"S25FL064A",      0x010216, 0x0,       64 * 1024,   128, 0},
-       {"S25FL116K",      0x014015, 0x0,       64 * 1024,   128, 0},
-       {"S25FL164K",      0x014017, 0x0140,    64 * 1024,   128, 0},
-       {"S25FL128P_256K", 0x012018, 0x0300,   256 * 1024,    64, RD_FULL | 
WR_QPP},
-       {"S25FL128P_64K",  0x012018, 0x0301,    64 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"S25FL032P",      0x010215, 0x4d00,    64 * 1024,    64, RD_FULL | 
WR_QPP},
-       {"S25FL064P",      0x010216, 0x4d00,    64 * 1024,   128, RD_FULL | 
WR_QPP},
-       {"S25FL128S_256K", 0x012018, 0x4d00,   256 * 1024,    64, RD_FULL | 
WR_QPP},
-       {"S25FL128S_64K",  0x012018, 0x4d01,    64 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"S25FL256S_256K", 0x010219, 0x4d00,   256 * 1024,   128, RD_FULL | 
WR_QPP},
-       {"S25FL256S_64K",  0x010219, 0x4d01,    64 * 1024,   512, RD_FULL | 
WR_QPP},
-       {"S25FS512S",      0x010220, 0x4D00,   128 * 1024,   512, RD_FULL | 
WR_QPP},
-       {"S25FL512S_256K", 0x010220, 0x4d00,   256 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"S25FL512S_64K",  0x010220, 0x4d01,    64 * 1024,  1024, RD_FULL | 
WR_QPP},
-       {"S25FL512S_512K", 0x010220, 0x4f00,   256 * 1024,   256, RD_FULL | 
WR_QPP},
+       {"S25FL008A",      INFO(0x010213, 0x0, 64 * 1024,    16, 0) },
+       {"S25FL016A",      INFO(0x010214, 0x0, 64 * 1024,    32, 0) },
+       {"S25FL032A",      INFO(0x010215, 0x0, 64 * 1024,    64, 0) },
+       {"S25FL064A",      INFO(0x010216, 0x0, 64 * 1024,   128, 0) },
+       {"S25FL116K",      INFO(0x014015, 0x0, 64 * 1024,   128, 0) },
+       {"S25FL164K",      INFO(0x014017, 0x0140,  64 * 1024,   128, 0) },
+       {"S25FL128P_256K", INFO(0x012018, 0x0300, 256 * 1024,    64, RD_FULL | 
WR_QPP) },
+       {"S25FL128P_64K",  INFO(0x012018, 0x0301,  64 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"S25FL032P",      INFO(0x010215, 0x4d00,  64 * 1024,    64, RD_FULL | 
WR_QPP) },
+       {"S25FL064P",      INFO(0x010216, 0x4d00,  64 * 1024,   128, RD_FULL | 
WR_QPP) },
+       {"S25FL128S_256K", INFO(0x012018, 0x4d00, 256 * 1024,    64, RD_FULL | 
WR_QPP) },
+       {"S25FL128S_64K",  INFO(0x012018, 0x4d01,  64 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"S25FL256S_256K", INFO(0x010219, 0x4d00, 256 * 1024,   128, RD_FULL | 
WR_QPP) },
+       {"S25FL256S_64K",  INFO(0x010219, 0x4d01,  64 * 1024,   512, RD_FULL | 
WR_QPP) },
+       {"S25FS512S",      INFO(0x010220, 0x4D00, 128 * 1024,   512, RD_FULL | 
WR_QPP) },
+       {"S25FL512S_256K", INFO(0x010220, 0x4d00, 256 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"S25FL512S_64K",  INFO(0x010220, 0x4d01,  64 * 1024,  1024, RD_FULL | 
WR_QPP) },
+       {"S25FL512S_512K", INFO(0x010220, 0x4f00, 256 * 1024,   256, RD_FULL | 
WR_QPP) },
 #endif
 #ifdef CONFIG_SPI_FLASH_STMICRO                /* STMICRO */
-       {"M25P10",         0x202011, 0x0,       32 * 1024,     4, 0},
-       {"M25P20",         0x202012, 0x0,       64 * 1024,     4, 0},
-       {"M25P40",         0x202013, 0x0,       64 * 1024,     8, 0},
-       {"M25P80",         0x202014, 0x0,       64 * 1024,    16, 0},
-       {"M25P16",         0x202015, 0x0,       64 * 1024,    32, 0},
-       {"M25PE16",        0x208015, 0x1000,    64 * 1024,    32, 0},
-       {"M25PX16",        0x207115, 0x1000,    64 * 1024,    32, RD_QUAD | 
RD_DUAL},
-       {"M25P32",         0x202016, 0x0,       64 * 1024,    64, 0},
-       {"M25P64",         0x202017, 0x0,       64 * 1024,   128, 0},
-       {"M25P128",        0x202018, 0x0,      256 * 1024,    64, 0},
-       {"M25PX64",        0x207117, 0x0,       64 * 1024,   128, SECT_4K},
-       {"N25Q016A",       0x20bb15, 0x0,       64 * 1024,    32, SECT_4K},
-       {"N25Q32",         0x20ba16, 0x0,       64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q32A",        0x20bb16, 0x0,       64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q64",         0x20ba17, 0x0,       64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q64A",        0x20bb17, 0x0,       64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q128",        0x20ba18, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"N25Q128A",       0x20bb18, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP},
-       {"N25Q256",        0x20ba19, 0x0,       64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q256A",       0x20bb19, 0x0,       64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K},
-       {"N25Q512",        0x20ba20, 0x0,       64 * 1024,  1024, RD_FULL | 
WR_QPP | E_FSR | SECT_4K},
-       {"N25Q512A",       0x20bb20, 0x0,       64 * 1024,  1024, RD_FULL | 
WR_QPP | E_FSR | SECT_4K},
-       {"N25Q1024",       0x20ba21, 0x0,       64 * 1024,  2048, RD_FULL | 
WR_QPP | E_FSR | SECT_4K},
-       {"N25Q1024A",      0x20bb21, 0x0,       64 * 1024,  2048, RD_FULL | 
WR_QPP | E_FSR | SECT_4K},
+       {"M25P10",         INFO(0x202011, 0x0, 32 * 1024,     4, 0) },
+       {"M25P20",         INFO(0x202012, 0x0, 64 * 1024,     4, 0) },
+       {"M25P40",         INFO(0x202013, 0x0, 64 * 1024,     8, 0) },
+       {"M25P80",         INFO(0x202014, 0x0, 64 * 1024,    16, 0) },
+       {"M25P16",         INFO(0x202015, 0x0, 64 * 1024,    32, 0) },
+       {"M25PE16",        INFO(0x208015, 0x1000, 64 * 1024, 32, 0) },
+       {"M25PX16",        INFO(0x207115, 0x1000, 64 * 1024, 32, RD_QUAD | 
RD_DUAL) },
+       {"M25P32",         INFO(0x202016, 0x0,  64 * 1024,    64, 0) },
+       {"M25P64",         INFO(0x202017, 0x0,  64 * 1024,   128, 0) },
+       {"M25P128",        INFO(0x202018, 0x0, 256 * 1024,    64, 0) },
+       {"M25PX64",        INFO(0x207117, 0x0,  64 * 1024,   128, SECT_4K) },
+       {"N25Q016A",       INFO(0x20bb15, 0x0,  64 * 1024,    32, SECT_4K) },
+       {"N25Q32",         INFO(0x20ba16, 0x0,  64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q32A",        INFO(0x20bb16, 0x0,  64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q64",         INFO(0x20ba17, 0x0,  64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q64A",        INFO(0x20bb17, 0x0,  64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q128",        INFO(0x20ba18, 0x0,  64 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"N25Q128A",       INFO(0x20bb18, 0x0,  64 * 1024,   256, RD_FULL | 
WR_QPP) },
+       {"N25Q256",        INFO(0x20ba19, 0x0,  64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q256A",       INFO(0x20bb19, 0x0,  64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"N25Q512",        INFO(0x20ba20, 0x0,  64 * 1024,  1024, RD_FULL | 
WR_QPP | E_FSR | SECT_4K) },
+       {"N25Q512A",       INFO(0x20bb20, 0x0,  64 * 1024,  1024, RD_FULL | 
WR_QPP | E_FSR | SECT_4K) },
+       {"N25Q1024",       INFO(0x20ba21, 0x0,  64 * 1024,  2048, RD_FULL | 
WR_QPP | E_FSR | SECT_4K) },
+       {"N25Q1024A",      INFO(0x20bb21, 0x0,  64 * 1024,  2048, RD_FULL | 
WR_QPP | E_FSR | SECT_4K) },
 #endif
 #ifdef CONFIG_SPI_FLASH_SST            /* SST */
-       {"SST25VF040B",    0xbf258d, 0x0,       64 * 1024,     8, SECT_4K | 
SST_WR},
-       {"SST25VF080B",    0xbf258e, 0x0,       64 * 1024,    16, SECT_4K | 
SST_WR},
-       {"SST25VF016B",    0xbf2541, 0x0,       64 * 1024,    32, SECT_4K | 
SST_WR},
-       {"SST25VF032B",    0xbf254a, 0x0,       64 * 1024,    64, SECT_4K | 
SST_WR},
-       {"SST25VF064C",    0xbf254b, 0x0,       64 * 1024,   128, SECT_4K},
-       {"SST25WF512",     0xbf2501, 0x0,       64 * 1024,     1, SECT_4K | 
SST_WR},
-       {"SST25WF010",     0xbf2502, 0x0,       64 * 1024,     2, SECT_4K | 
SST_WR},
-       {"SST25WF020",     0xbf2503, 0x0,       64 * 1024,     4, SECT_4K | 
SST_WR},
-       {"SST25WF040",     0xbf2504, 0x0,       64 * 1024,     8, SECT_4K | 
SST_WR},
-       {"SST25WF040B",    0x621613, 0x0,       64 * 1024,     8, SECT_4K},
-       {"SST25WF080",     0xbf2505, 0x0,       64 * 1024,    16, SECT_4K | 
SST_WR},
+       {"SST25VF040B",    INFO(0xbf258d, 0x0,  64 * 1024,     8, SECT_4K | 
SST_WR) },
+       {"SST25VF080B",    INFO(0xbf258e, 0x0,  64 * 1024,    16, SECT_4K | 
SST_WR) },
+       {"SST25VF016B",    INFO(0xbf2541, 0x0,  64 * 1024,    32, SECT_4K | 
SST_WR) },
+       {"SST25VF032B",    INFO(0xbf254a, 0x0,  64 * 1024,    64, SECT_4K | 
SST_WR) },
+       {"SST25VF064C",    INFO(0xbf254b, 0x0,  64 * 1024,   128, SECT_4K) },
+       {"SST25WF512",     INFO(0xbf2501, 0x0,  64 * 1024,     1, SECT_4K | 
SST_WR) },
+       {"SST25WF010",     INFO(0xbf2502, 0x0,  64 * 1024,     2, SECT_4K | 
SST_WR) },
+       {"SST25WF020",     INFO(0xbf2503, 0x0,  64 * 1024,     4, SECT_4K | 
SST_WR) },
+       {"SST25WF040",     INFO(0xbf2504, 0x0,  64 * 1024,     8, SECT_4K | 
SST_WR) },
+       {"SST25WF040B",    INFO(0x621613, 0x0,  64 * 1024,     8, SECT_4K) },
+       {"SST25WF080",     INFO(0xbf2505, 0x0,  64 * 1024,    16, SECT_4K | 
SST_WR) },
 #endif
 #ifdef CONFIG_SPI_FLASH_WINBOND                /* WINBOND */
-       {"W25P80",         0xef2014, 0x0,       64 * 1024,    16, 0},
-       {"W25P16",         0xef2015, 0x0,       64 * 1024,    32, 0},
-       {"W25P32",         0xef2016, 0x0,       64 * 1024,    64, 0},
-       {"W25X40",         0xef3013, 0x0,       64 * 1024,     8, SECT_4K},
-       {"W25X16",         0xef3015, 0x0,       64 * 1024,    32, SECT_4K},
-       {"W25X32",         0xef3016, 0x0,       64 * 1024,    64, SECT_4K},
-       {"W25X64",         0xef3017, 0x0,       64 * 1024,   128, SECT_4K},
-       {"W25Q80BL",       0xef4014, 0x0,       64 * 1024,    16, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q16CL",       0xef4015, 0x0,       64 * 1024,    32, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q32BV",       0xef4016, 0x0,       64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q64CV",       0xef4017, 0x0,       64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q128BV",      0xef4018, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q256",        0xef4019, 0x0,       64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q80BW",       0xef5014, 0x0,       64 * 1024,    16, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q16DW",       0xef6015, 0x0,       64 * 1024,    32, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q32DW",       0xef6016, 0x0,       64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q64DW",       0xef6017, 0x0,       64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K},
-       {"W25Q128FW",      0xef6018, 0x0,       64 * 1024,   256, RD_FULL | 
WR_QPP | SECT_4K},
+       {"W25P80",         INFO(0xef2014, 0x0,  64 * 1024,    16, 0) },
+       {"W25P16",         INFO(0xef2015, 0x0,  64 * 1024,    32, 0) },
+       {"W25P32",         INFO(0xef2016, 0x0,  64 * 1024,    64, 0) },
+       {"W25X40",         INFO(0xef3013, 0x0,  64 * 1024,     8, SECT_4K) },
+       {"W25X16",         INFO(0xef3015, 0x0,  64 * 1024,    32, SECT_4K) },
+       {"W25X32",         INFO(0xef3016, 0x0,  64 * 1024,    64, SECT_4K) },
+       {"W25X64",         INFO(0xef3017, 0x0,  64 * 1024,   128, SECT_4K) },
+       {"W25Q80BL",       INFO(0xef4014, 0x0,  64 * 1024,    16, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q16CL",       INFO(0xef4015, 0x0,  64 * 1024,    32, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q32BV",       INFO(0xef4016, 0x0,  64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q64CV",       INFO(0xef4017, 0x0,  64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q128BV",      INFO(0xef4018, 0x0,  64 * 1024,   256, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q256",        INFO(0xef4019, 0x0,  64 * 1024,   512, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q80BW",       INFO(0xef5014, 0x0,  64 * 1024,    16, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q16DW",       INFO(0xef6015, 0x0,  64 * 1024,    32, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q32DW",       INFO(0xef6016, 0x0,  64 * 1024,    64, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q64DW",       INFO(0xef6017, 0x0,  64 * 1024,   128, RD_FULL | 
WR_QPP | SECT_4K) },
+       {"W25Q128FW",      INFO(0xef6018, 0x0,  64 * 1024,   256, RD_FULL | 
WR_QPP | SECT_4K) },
 #endif
        {},     /* Empty entry to terminate the list */
        /*
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 7f6e9ae..58d5a6a 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -924,6 +924,31 @@ static int micron_quad_enable(struct spi_flash *flash)
 }
 #endif
 
+static const struct spi_flash_params *spi_flash_read_id(struct spi_flash 
*flash)
+{
+       int                             tmp;
+       u8                              id[5];
+       const struct spi_flash_params   *params;
+
+       tmp = spi_flash_cmd(flash->spi, CMD_READ_ID, id, 5);
+       if (tmp < 0) {
+               printf("SF: error %d reading JEDEC ID\n", tmp);
+               return ERR_PTR(tmp);
+       }
+
+       params = spi_flash_params_table;
+       for (; params->name != NULL; params++) {
+               if (params->id_len) {
+                       if (!memcmp(params->id, id, params->id_len))
+                               return params;
+               }
+       }
+
+       printf("SF: unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
+               id[0], id[1], id[2]);
+       return ERR_PTR(-ENODEV);
+}
+
 static int set_quad_mode(struct spi_flash *flash, u8 idcode0)
 {
        switch (idcode0) {
@@ -1011,46 +1036,18 @@ static int spansion_s25fss_disable_4KB_erase(struct 
spi_slave *spi)
 int spi_flash_scan(struct spi_flash *flash)
 {
        struct spi_slave *spi = flash->spi;
-       const struct spi_flash_params *params;
+       const struct spi_flash_params *params = NULL;
        u16 jedec, ext_jedec;
        u8 idcode[5];
        int ret;
 
-       /* Read the ID codes */
-       ret = spi_flash_cmd(spi, CMD_READ_ID, idcode, sizeof(idcode));
-       if (ret) {
-               printf("SF: Failed to get idcodes\n");
-               return ret;
-       }
-
-#ifdef DEBUG
-       printf("SF: Got idcodes\n");
-       print_buffer(0, idcode, 1, sizeof(idcode), 0);
-#endif
+       params = spi_flash_read_id(flash);
+       if (IS_ERR_OR_NULL(params))
+               return -ENOENT;
 
        jedec = idcode[1] << 8 | idcode[2];
        ext_jedec = idcode[3] << 8 | idcode[4];
 
-       /* Validate params from spi_flash_params table */
-       params = spi_flash_params_table;
-       for (; params->name != NULL; params++) {
-               if ((params->jedec >> 16) == idcode[0]) {
-                       if ((params->jedec & 0xFFFF) == jedec) {
-                               if (params->ext_jedec == 0)
-                                       break;
-                               else if (params->ext_jedec == ext_jedec)
-                                       break;
-                       }
-               }
-       }
-
-       if (!params->name) {
-               printf("SF: Unsupported flash IDs: ");
-               printf("manuf %02x, jedec %04x, ext_jedec %04x\n",
-                      idcode[0], jedec, ext_jedec);
-               return -EPROTONOSUPPORT;
-       }
-
 #ifdef CONFIG_SPI_FLASH_SPANSION
        /*
         * The S25FS-S family physical sectors may be configured as a
diff --git a/include/linux/err.h b/include/linux/err.h
index 5b3c8bc..1bba498 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -36,6 +36,11 @@ static inline long IS_ERR(const void *ptr)
        return IS_ERR_VALUE((unsigned long)ptr);
 }
 
+static inline bool IS_ERR_OR_NULL(const void *ptr)
+{
+       return !ptr || IS_ERR_VALUE((unsigned long)ptr);
+}
+
 /**
  * ERR_CAST - Explicitly cast an error-valued pointer to another pointer type
  * @ptr: The pointer to cast.
-- 
2.7.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to