Merge branch 'bugfix/fix_flash_read_error_in_dio_mode_v3.1' into 'release/v3.1'

bugfix(flash): add spi dio address bitlen configure in psram init (backport v3.1)

See merge request espressif/esp-idf!5784
This commit is contained in:
Wang Jia Lin 2019-08-21 16:18:53 +08:00
commit fd0ecca4c9

View file

@ -450,6 +450,7 @@ static void IRAM_ATTR psram_gpio_config(psram_cache_mode_t mode)
spi_cache_dummy = SPI0_R_QIO_DUMMY_CYCLELEN;
} else if (rd_mode_reg & SPI_FREAD_DIO_M) {
spi_cache_dummy = SPI0_R_DIO_DUMMY_CYCLELEN;
SET_PERI_REG_BITS(SPI_USER1_REG(0), SPI_USR_ADDR_BITLEN_V, SPI0_R_DIO_ADDR_BITSLEN, SPI_USR_ADDR_BITLEN_S);
} else if (rd_mode_reg & (SPI_FREAD_QUAD_M | SPI_FREAD_DUAL_M)) {
spi_cache_dummy = SPI0_R_FAST_DUMMY_CYCLELEN;
} else {