GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 13:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2017-12-19 07:57:40 -05:00
commit b55c89ce02
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/mtd/spi/spi_flash_ids.c
View file

@ -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) },

1
include/spi.h
View file

@ -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 */