mtd:spi-nor: Added support for issi flash parts

 Added support for issi flash parts is25lp128, is25lp064 & is25lp032

Signed-off-by: Anurag Kumar Vulisha <anuragku@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 4aac0380e65ed3e2bc3276bd909bb4b29c69cac7..6d8542931a4872be7cc31b1dc2982f33291d6382 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -308,6 +308,7 @@ static const struct spi_device_id m25p_ids[] = {
        {"w25x64"},     {"w25q64"},     {"w25q128"},    {"w25q80"},
        {"w25q80bl"},   {"w25q128"},    {"w25q256"},    {"cat25c11"},
        {"cat25c03"},   {"cat25c09"},   {"cat25c17"},   {"cat25128"},
+       {"is25lp032"},  {"is25lp064"},  {"is25lp128"},
        { },
 };
 MODULE_DEVICE_TABLE(spi, m25p_ids);

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 9a636cccadd6256a20080722005129b55651f6d4..a10e6f09629da774d2d7c1a07419d35a8d85f868 100644 (file)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -869,6 +869,13 @@ static const struct spi_device_id spi_nor_ids[] = {
        { "cat25c09", CAT25_INFO( 128, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25c17", CAT25_INFO( 256, 8, 32, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
        { "cat25128", CAT25_INFO(2048, 8, 64, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
+               /* ISSI flash */
+       { "is25lp032", INFO(0x9d6016, 0, 64 * 1024, 64,
+                               SECT_4K | SPI_NOR_QUAD_IO_READ) },
+       { "is25lp064", INFO(0x9d6017, 0, 64 * 1024, 128,
+                               SECT_4K | SPI_NOR_QUAD_IO_READ) },
+       { "is25lp128", INFO(0x9D6018, 0, 64 * 1024, 256,
+                               SECT_4K | SPI_NOR_QUAD_IO_READ) },
        { },
 };
 
@@ -1215,6 +1222,7 @@ static int set_quad_mode(struct spi_nor *nor, u32 jedec_id)
        int status;
 
        switch (JEDEC_MFR(jedec_id)) {
+       case CFI_MFR_ISSI:
        case CFI_MFR_MACRONIX:
                status = macronix_quad_enable(nor);
                if (status) {

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 299d7d31fe539df197d571b584cca3423d6a1907..935ac0efc4ba8b9e939874ec28d7a0a8f36dcd50 100644 (file)
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -543,6 +543,7 @@ struct cfi_fixup {
 #define CFI_MFR_HYUNDAI                0x00AD
 #define CFI_MFR_INTEL          0x0089
 #define CFI_MFR_MACRONIX       0x00C2
+#define CFI_MFR_ISSI           0x009d
 #define CFI_MFR_NEC            0x0010
 #define CFI_MFR_PMC            0x009D
 #define CFI_MFR_SAMSUNG                0x00EC