Merge git://git.denx.de/u-boot-spi

diff --git a/drivers/mtd/spi/spi_flash_ids.c b/drivers/mtd/spi/spi_flash_ids.c
index 13f64e773fed4c4c9213c3e201a81605fc7ca76e..262d81e98d5fc40a8c03bd1c5026d06a325b3ec0 100644 (file)
--- a/drivers/mtd/spi/spi_flash_ids.c
+++ b/drivers/mtd/spi/spi_flash_ids.c
@@ -67,6 +67,7 @@ const struct spi_flash_info spi_flash_ids[] = {
        {"gd25lq32",       INFO(0xc86016, 0x0, 64 * 1024,    64, SECT_4K) },
 #endif
 #ifdef CONFIG_SPI_FLASH_ISSI           /* ISSI */
+       {"is25lq040b",     INFO(0x9d4013, 0x0, 64 * 1024,    8, 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) },

diff --git a/include/spi.h b/include/spi.h
index 8c4b882c54d390e91eaa8b5d01a2e9aaa1f18491..08c7480fda9c23f8aa8676de4b5432160ffb7e47 100644 (file)
--- a/include/spi.h
+++ b/include/spi.h
@@ -104,7 +104,6 @@ struct spi_slave {
        unsigned int wordlen;
        unsigned int max_write_size;
        void *memory_map;
-       u8 option;
 
        u8 flags;
 #define SPI_XFER_BEGIN         BIT(0)  /* Assert CS before transfer */