sf: Make flash->flags use for generic usage
PATCH 1/1 sf: Make flash->flags use for generic usage
From: Jagan Teki <[email protected]>
Use the flash->flags for generic usage, not only for dm-spi-flash, this will be used for future flag additions.
Signed-off-by Jagan Teki <[email protected]>
Cc Bin Meng <[email protected]>
Correct the spi flash flags detect logic.
Signed-off-by Bin Meng <[email protected]>
Tested-by Bin Meng <[email protected]>
---
drivers/mtd/spi/sf_internal.h | 4 ++++ drivers/mtd/spi/sf_probe.c | 11 ++++++----- include/spi_flash.h | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/mtd/spi/sf_internal.h +4 -0
@@ -51,6 +51,10 @@ enum {#define SST_WR (SST_BP | SST_WP) +enum spi_nor_option_flags { +SNOR_F_SST_WR = (1 <<0 ), +}; +#define SPI_FLASH_3B_ADDR_LEN 3#define SPI_FLASH_CMD_LEN (1 + SPI_FLASH_3B_ADDR_LEN)#define SPI_FLASH_16MB_BOUN 0x1000000
drivers/mtd/spi/sf_probe.c +6 -5
@@ -132,15 +132,16 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, flash->name = params->name; flash->memory_map = spi->memory_map; flash->dual_flash = flash->spi->option; -#ifdef CONFIG_DM_SPI_FLASH - flash->flags = params->flags; -#endif + +/* Assign spi flash flags */ +if (params->flags &SST_WR ) + flash->flags |=SNOR_F_SST_WR ;/* Assign spi_flash ops */ #ifndef CONFIG_DM_SPI_FLASH flash->write = spi_flash_cmd_write_ops; #if defined(CONFIG_SPI_FLASH_SST) - if (params->flags & SST_WR) { + if (flash->flags & SNOR_F_SST_WR) { if (flash->spi->op_mode_tx & SPI_OPM_TX_BP) flash->write = sst_write_bp; else
@@ -451,7 +452,7 @@ int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len,struct spi_flash *flash =dev_get_uclass_priv (dev);#if defined(CONFIG_SPI_FLASH_SST ) -if (flash->flags &SST_WR ) { +if (flash->flags &SNOR_F_SST_WR ) {if (flash->spi->op_mode_tx &SPI_OPM_TX_BP )return sst_write_bp (flash, offset, len, buf);else
include/spi_flash.h +2 -2
@@ -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
@@ -67,11 +67,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;
Signature · 1 line
1.8.2.1