diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-12 11:54:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-12 11:54:13 -0400 |
| commit | e6cd05e5025bbab9723bbb09c506cbb5aa63bc53 (patch) | |
| tree | 86b04c08de25b78711171da16ed7e4447588d1b6 /drivers/mtd/spi/spi_flash.c | |
| parent | 15f22ac2eea5ee9f17b14a143c94e7480bbafbff (diff) | |
| parent | 5c391486b411025785e064f160d248bef31b3d28 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/mtd/spi/spi_flash.c')
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index 92300603644..a87bacd4ac7 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -1091,6 +1091,7 @@ static int set_quad_mode(struct spi_flash *flash, #endif #ifdef CONFIG_SPI_FLASH_STMICRO case SPI_FLASH_CFI_MFR_STMICRO: + case SPI_FLASH_CFI_MFR_MICRON: debug("SF: QEB is volatile for %02x flash\n", JEDEC_MFR(info)); return 0; #endif @@ -1178,6 +1179,7 @@ int spi_flash_scan(struct spi_flash *flash) #if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) /* NOR protection support for STmicro/Micron chips and similar */ if (JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_STMICRO || + JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_MICRON || JEDEC_MFR(info) == SPI_FLASH_CFI_MFR_SST) { flash->flash_lock = stm_lock; flash->flash_unlock = stm_unlock; |