LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sf: Correct flash->flags for SST flash 

flash->flags for SST flash should be updated for both DM and non-DM
flash drivers.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
Bin Meng 2015-11-15 19:31:37 -08:00 committed by Jagan Teki
parent a668a164ff
commit 3e56ecec43
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/spi/sf_probe.c
View File

@ -164,14 +164,15 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode,
flash->memory_map = spi->memory_map; flash->memory_map = spi->memory_map;
flash->dual_flash = flash->spi->option; flash->dual_flash = flash->spi->option;
/* Assign spi flash flags */
if (params->flags & SST_WR)
flash->flags |= SNOR_F_SST_WR;
/* Assign spi_flash ops */ /* Assign spi_flash ops */
#ifndef CONFIG_DM_SPI_FLASH #ifndef CONFIG_DM_SPI_FLASH
flash->write = spi_flash_cmd_write_ops; flash->write = spi_flash_cmd_write_ops;
#if defined(CONFIG_SPI_FLASH_SST) #if defined(CONFIG_SPI_FLASH_SST)
if (params->flags & SST_WR) if (flash->flags & SNOR_F_SST_WR) {
flash->flags |= SNOR_F_SST_WR;
if (params->flags & SNOR_F_SST_WR) {
if (flash->spi->op_mode_tx & SPI_OPM_TX_BP) if (flash->spi->op_mode_tx & SPI_OPM_TX_BP)
flash->write = sst_write_bp; flash->write = sst_write_bp;
else else