diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-28 16:56:43 -0400 |
| commit | 446d37c1acc76680770400fd90e6c502e49d72df (patch) | |
| tree | f309e83e262b0ee6e41d0f1bf92af9fb0e3faa18 /include/spi_flash.h | |
| parent | ab0a6a5dba740afb490e6e7d417e345284e0dbec (diff) | |
| parent | bef87adf95e7ca923f866e27bbcccb2dad85df9f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'include/spi_flash.h')
| -rw-r--r-- | include/spi_flash.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/spi_flash.h b/include/spi_flash.h index 3b2d555c77b..4312d3d691e 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -38,10 +38,10 @@ struct spi_slave; * * @spi: SPI slave * @dev: SPI flash device - * @flags: Indication of spi flash flags * @name: Name of SPI flash * @dual_flash: Indicates dual flash memories - dual stacked, parallel * @shift: Flash shift useful in dual parallel + * @flags: Indication of spi flash flags * @size: Total flash size * @page_size: Write (page) size * @sector_size: Sector size @@ -49,7 +49,6 @@ struct spi_slave; * @bank_read_cmd: Bank read cmd * @bank_write_cmd: Bank write cmd * @bank_curr: Current flash bank - * @poll_cmd: Poll cmd - for flash erase/program * @erase_cmd: Erase cmd 4K, 32K, 64K * @read_cmd: Read cmd - Array Fast, Extn read and quad read. * @write_cmd: Write cmd - page and quad program. @@ -67,11 +66,11 @@ struct spi_flash { struct spi_slave *spi; #ifdef CONFIG_DM_SPI_FLASH struct udevice *dev; - u16 flags; #endif const char *name; u8 dual_flash; u8 shift; + u16 flags; u32 size; u32 page_size; @@ -82,7 +81,6 @@ struct spi_flash { u8 bank_write_cmd; u8 bank_curr; #endif - u8 poll_cmd; u8 erase_cmd; u8 read_cmd; u8 write_cmd; |