Merge git://git.denx.de/u-boot-spi
This commit is contained in:
commit
b55c89ce02
@ -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) },
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user