SST_WR => SST_WRITE
Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com Cc: Michal Simek michal.simek@xilinx.com Cc: Siva Durga Prasad Paladugu sivadur@xilinx.com Tested-by: Mugunthan V N mugunthanvnm@ti.com Tested-by: Jagan Teki jteki@openedev.com Signed-off-by: Jagan Teki jteki@openedev.com --- drivers/mtd/spi/sf_internal.h | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi_flash.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 007a5a0..8eaadd7 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -49,7 +49,7 @@ enum { };
enum spi_nor_option_flags { - SNOR_F_SST_WR = BIT(0), + SNOR_F_SST_WRITE = BIT(0), SNOR_F_USE_FSR = BIT(1), };
diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index daa1d5b..4da67d0 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -127,7 +127,7 @@ static 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 & SNOR_F_SST_WR) { + if (flash->flags & SNOR_F_SST_WRITE) { if (flash->spi->mode & SPI_TX_BYTE) return sst_write_bp(flash, offset, len, buf); else diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 2c309e7..bf9ac36 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1325,14 +1325,14 @@ int spi_flash_scan(struct spi_flash *flash) flash->dual_flash = spi->option;
/* Assign spi flash flags */ - if (info->flags & SST_WR) - flash->flags |= SNOR_F_SST_WR; + if (info->flags & SST_WRITE) + flash->flags |= SNOR_F_SST_WRITE;
/* Assign spi_flash ops */ #ifndef CONFIG_DM_SPI_FLASH flash->write = spi_flash_cmd_write_ops; #if defined(CONFIG_SPI_FLASH_SST) - if (flash->flags & SNOR_F_SST_WR) { + if (flash->flags & SNOR_F_SST_WRITE) { if (spi->mode & SPI_TX_BYTE) flash->write = sst_write_bp; else